Ignore spacing in metadata.rb files.

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 2e540f0b572f2e6e371843efcd507b36a0c259c3..85bb7466f7cc5d93afdc66a21b2a3b5d32329f81 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-#include_recipe "squid"
+# include_recipe "squid"
 
 include_recipe "mediawiki"
 
@@ -32,10 +32,12 @@ mediawiki_site  "wiki.openstreetmap.org" do
   directory     "/srv/wiki.openstreetmap.org"
 
   enable_ssl    TRUE
-  
+
   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,9 +46,11 @@ mediawiki_site  "wiki.openstreetmap.org" do
   email_sender_name "OpenStreetMap Wiki"
 
   metanamespace "OpenStreetMap"
-  
-  #site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8:00am UTC/GMT."
 
+  recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
+  recaptcha_private_key passwords["recaptcha"]
+
+  # site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8:00am UTC/GMT."
 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
@@ -77,9 +81,7 @@ end
 apache_site "dump.wiki.openstreetmap.org" do
   template  "apache_wiki_dump.erb"
   directory "/srv/dump.wiki.openstreetmap.org"
-  variables({
-    :aliases => "dump.wiki.osm.org"
-  })
+  variables :aliases => "dump.wiki.osm.org"
 end
 
 template "/etc/cron.d/wiki-osm-org-dump" do
@@ -88,4 +90,3 @@ template "/etc/cron.d/wiki-osm-org-dump" do
   mode 0644
   source "cron_wiki_dump.erb"
 end
-