X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8b72732cd79ec76f34a560cfd9f1d526d7a7ce7e..0024cffb7b0d6869b0596b7520e3d2bdf45d7b96:/cookbooks/foundation/recipes/wiki.rb

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index f5347ee42..4f5914a1d 100644
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -21,18 +21,23 @@ include_recipe "mediawiki"
 
 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"
+  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"
   email_sender "webmaster@openstreetmap.org"
   email_sender_name "OSMF Wiki"
   private_accounts true
+  recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
+  recaptcha_private_key passwords["wiki"]["recaptcha"]
 end
 
 cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do