No need for HEADER.cgi to be writable by the web server

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 2e540f0b572f2e6e371843efcd507b36a0c259c3..78f16ed0edb4d9a2fcdd58739e78238d8b341820 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -35,7 +35,9 @@ mediawiki_site  "wiki.openstreetmap.org" do
   
   database_name "wiki"
   database_username "wiki-user"
-  database_password passwords["wiki-user"]
+  database_password passwords["database"]
+
+  admin_password passwords["admin"]
 
   logo          "/osm_logo_wiki.png"
 
@@ -44,6 +46,9 @@ mediawiki_site  "wiki.openstreetmap.org" do
   email_sender_name "OpenStreetMap Wiki"
 
   metanamespace "OpenStreetMap"
+
+  recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
+  recaptcha_private_key passwords["recaptcha"]
   
   #site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8:00am UTC/GMT."