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 5d54b5426f8b152aa924bf9b16c8a17fb6a4c3b4..4f5914a1d04b5d883dffe0d1b142f850dbea9e04 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -21,12 +21,15 @@ include_recipe "mediawiki"
 
 passwords = data_bag_item("foundation", "passwords")
 
 
 passwords = data_bag_item("foundation", "passwords")
 

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

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

+  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"