X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cf6ffe7eb9032fa7b5295296b6303ce35036a620..4978d9ecdfcbac444ddf057622403e1e5148654a:/cookbooks/foundation/recipes/wiki.rb

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 661afb365..905b30176 100644
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -21,16 +21,29 @@ 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
+
+mediawiki_skin "osmf" do
+  site "wiki.osmfoundation.org"
+  repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git"
+  revision "master"
 end
 
 cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do