imagery: force only GET requests to mapserver

[chef.git] / cookbooks / wiki / recipes / default.rb

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 23b88aea15cd18b2a5b6dde80238ade3ffb49d5f..f740d9c06ff6a8116eac08d5567cad262d271213 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -28,13 +28,15 @@ apache_site "default" do
 end
 
 mediawiki_site "wiki.openstreetmap.org" do
 end
 
 mediawiki_site "wiki.openstreetmap.org" do

-  aliases "wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net", "wiki.openstreetmap.ca", "wiki.openstreetmap.eu", "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"
+  aliases ["wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net",
+           "wiki.openstreetmap.ca", "wiki.openstreetmap.eu",
+           "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"]

   directory "/srv/wiki.openstreetmap.org"
 
   directory "/srv/wiki.openstreetmap.org"
 

-  enable_ssl TRUE
+  ssl_enabled TRUE

 
   database_name "wiki"
 
   database_name "wiki"

-  database_username "wiki-user"
+  database_user "wiki-user"

   database_password passwords["database"]
 
   admin_password passwords["admin"]
   database_password passwords["database"]
 
   admin_password passwords["admin"]


@@ -50,7 +52,8 @@ mediawiki_site "wiki.openstreetmap.org" do
   recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
   recaptcha_private_key passwords["recaptcha"]
 
   recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
   recaptcha_private_key passwords["recaptcha"]
 

-  # site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8:00am UTC/GMT."
+  # site_notice "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
+  # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."

 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do