Set admin password for foundation wiki

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

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 9033f98f53f2e96b81b708dcbdb3535f1e92cd69..4f5914a1d04b5d883dffe0d1b142f850dbea9e04 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -22,13 +22,14 @@ include_recipe "mediawiki"
 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"
-  enable_ssl true
+  ssl_enabled true
   database_name "osmf-wiki"
-  database_username "osmf-wikiuser"
+  database_user "osmf-wikiuser"
   database_password passwords["wiki"]["database"]
+  admin_password passwords["wiki"]["admin"]
   skin "osmf"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"