From: Tom Hughes <tom@compton.nu>
Date: Wed, 7 Jan 2015 13:40:44 +0000 (+0000)
Subject: Move recaptcha keys our of mediawiki cookbook
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6d0cd3cd047cf2dc6d47d6482865d7aafe2588d2?hp=985de5ddf1a72c9492082ffd4aabd4a6dd151a1e;ds=inline

Move recaptcha keys our of mediawiki cookbook
---

diff --git a/cookbooks/mediawiki/definitions/mediawiki_extension.rb b/cookbooks/mediawiki/definitions/mediawiki_extension.rb
index 91c311656..37c93e41d 100644
--- a/cookbooks/mediawiki/definitions/mediawiki_extension.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_extension.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-define :mediawiki_extension, :action => [ :enable ] do
+define :mediawiki_extension, :action => [ :enable ], :variables => {} do
   name = params[:name]
   site = params[:site]
   site_directory = node[:mediawiki][:sites][site][:site_directory]
@@ -25,6 +25,7 @@ define :mediawiki_extension, :action => [ :enable ] do
   extension_directory = "#{mediawiki_directory}/extensions/#{name}"
   source = params[:source]
   template = params[:template]
+  template_variables = params[:variables]
 
   if source
     remote_directory extension_directory do
@@ -67,6 +68,7 @@ define :mediawiki_extension, :action => [ :enable ] do
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0664
+      variables template_variables
       notifies :create, resources(:template => "#{mediawiki_directory}/LocalSettings.php")
     end
   end
diff --git a/cookbooks/mediawiki/definitions/mediawiki_site.rb b/cookbooks/mediawiki/definitions/mediawiki_site.rb
index 3e427b249..f8f03c18e 100644
--- a/cookbooks/mediawiki/definitions/mediawiki_site.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_site.rb
@@ -39,23 +39,25 @@ define :mediawiki_site, :action => [ :create, :enable ] do
   mediawiki_reference      = "refs/heads/REL#{mediawiki_version}".tr(".", "_")
 
   mediawiki = {
-    :directory        => "#{site_directory}/w",
-    :site             => name,
-    :sitename         => params[:sitename] || "OpenStreetMap Wiki",
-    :metanamespace    => params[:metanamespace] || "OpenStreetMap",
-    :logo             => params[:logo] || "$wgStylePath/common/images/wiki.png",
-    :email_contact    => params[:email_contact] || "",
-    :email_sender     => params[:email_sender] || "",
+    :directory         => "#{site_directory}/w",
+    :site              => name,
+    :sitename          => params[:sitename] || "OpenStreetMap Wiki",
+    :metanamespace     => params[:metanamespace] || "OpenStreetMap",
+    :logo              => params[:logo] || "$wgStylePath/common/images/wiki.png",
+    :email_contact     => params[:email_contact] || "",
+    :email_sender      => params[:email_sender] || "",
     :email_sender_name => params[:email_sender_name] || "MediaWiki Mail", 
-    :commons          => params[:commons] || TRUE,
-    :skin             => params[:skin] || "vector",
-    :site_notice      => params[:site_notice] || "",
-    :site_readonly    => params[:site_readonly] || FALSE,
-    :site_admin_user  => "Admin",
-    :site_admin_pw    => params[:admin_password],
-    :enable_ssl       => params[:enable_ssl] || FALSE,
-    :private_accounts => params[:private_accounts] || FALSE,
-    :private          => params[:private] || FALSE
+    :commons           => params[:commons] || TRUE,
+    :skin              => params[:skin] || "vector",
+    :site_notice       => params[:site_notice] || "",
+    :site_readonly     => params[:site_readonly] || FALSE,
+    :site_admin_user   => "Admin",
+    :site_admin_pw     => params[:admin_password],
+    :enable_ssl        => params[:enable_ssl] || FALSE,
+    :private_accounts  => params[:private_accounts] || FALSE,
+    :private           => params[:private] || FALSE,
+    :recaptcha_public  => params[:recaptcha_public_key],
+    :recaptcha_private => params[:recaptcha_private_key],
   }
 
 #----------------
@@ -207,6 +209,8 @@ define :mediawiki_site, :action => [ :create, :enable ] do
   mediawiki_extension "ConfirmEdit" do
     site name
     template "mw-ext-ConfirmEdit.inc.php.erb"
+    variables :public_key => mediawiki[:recaptcha_public],
+              :private_key => mediawiki[:recaptcha_private]
   end
 
   mediawiki_extension "Gadgets" do
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
index e2759a02f..0bb3b91ff 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-ConfirmEdit.inc.php.erb
@@ -2,6 +2,6 @@
 # DO NOT EDIT - This file is being maintained by Chef
 require_once( $IP.'/extensions/ConfirmEdit/ReCaptcha.php' );
 $wgCaptchaClass = 'ReCaptcha';
-$recaptcha_public_key = '6Lc9OLsSAAAAAKazGuA9zItboXIHb6ObYOdiVm6o';
-$recaptcha_private_key = '6Lc9OLsSAAAAAKVZr9jFBc0GL-9Fm2H-paqu-4TB';
+$recaptcha_public_key = '<%= @public_key %>';
+$recaptcha_private_key = '<%= @private_key %>';
 $wgCaptchaTriggers['addurl'] = true;
diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 9d95de424..6234336e8 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -46,6 +46,9 @@ mediawiki_site  "wiki.openstreetmap.org" do
   email_sender_name "OpenStreetMap Wiki"
 
   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."