X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6d0cd3cd047cf2dc6d47d6482865d7aafe2588d2..f4d9298947b4e2f3740236d9fe51aec7e63ce31e:/cookbooks/wiki/recipes/default.rb

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 6234336e8..85bb7466f 100644
--- 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,7 +32,7 @@ mediawiki_site  "wiki.openstreetmap.org" do
   directory     "/srv/wiki.openstreetmap.org"
 
   enable_ssl    TRUE
-  
+
   database_name "wiki"
   database_username "wiki-user"
   database_password passwords["database"]
@@ -47,11 +47,10 @@ mediawiki_site  "wiki.openstreetmap.org" do
 
   metanamespace "OpenStreetMap"
 
-  recaptcha_public_key "6Lc9OLsSAAAAAKazGuA9zItboXIHb6ObYOdiVm6o"
-  recaptcha_private_key "6Lc9OLsSAAAAAKVZr9jFBc0GL-9Fm2H-paqu-4TB"
-  
-  #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
@@ -82,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
@@ -93,4 +90,3 @@ template "/etc/cron.d/wiki-osm-org-dump" do
   mode 0644
   source "cron_wiki_dump.erb"
 end
-