X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace:/cookbooks/wiki/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index 29fa60db5..85bb7466f 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -17,7 +17,7 @@ # limitations under the License. # -#include_recipe "squid" +# include_recipe "squid" include_recipe "mediawiki" @@ -50,8 +50,7 @@ mediawiki_site "wiki.openstreetmap.org" do recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz" recaptcha_private_key passwords["recaptcha"] - #site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8:00am UTC/GMT." - + # site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8:00am UTC/GMT." end cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do @@ -82,9 +81,7 @@ end apache_site "dump.wiki.openstreetmap.org" do template "apache_wiki_dump.erb" directory "/srv/dump.wiki.openstreetmap.org" - variables({ - :aliases => "dump.wiki.osm.org" - }) + variables :aliases => "dump.wiki.osm.org" end template "/etc/cron.d/wiki-osm-org-dump" do