wordpress: Restrict access to a few version discovery vectors

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

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index f2d79513814c71a60956537fff1cc71c4c5d2a85..4f5914a1d04b5d883dffe0d1b142f850dbea9e04 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -22,12 +22,14 @@ include_recipe "mediawiki"
 passwords = data_bag_item("foundation", "passwords")
 
 mediawiki_site "wiki.osmfoundation.org" do
 passwords = data_bag_item("foundation", "passwords")
 
 mediawiki_site "wiki.osmfoundation.org" do

-  aliases "www.osmfoundation.org", "osmfoundation.org"
+  aliases ["www.osmfoundation.org", "osmfoundation.org"]
+  sitename "OpenStreetMap Foundation Wiki"

   directory "/srv/wiki.osmfoundation.org"
   directory "/srv/wiki.osmfoundation.org"

-  enable_ssl true
+  ssl_enabled true

   database_name "osmf-wiki"
   database_name "osmf-wiki"

-  database_username "osmf-wikiuser"
+  database_user "osmf-wikiuser"

   database_password passwords["wiki"]["database"]
   database_password passwords["wiki"]["database"]

+  admin_password passwords["wiki"]["admin"]

   skin "osmf"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"
   skin "osmf"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"