From f74bcccbb0c66a29e20b7972ee3dbd3a60a23593 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 20 Aug 2016 14:51:29 +0000 Subject: [PATCH] Switch wiki.o.o to recaptcha-nocaptcha The newer recaptcha-nocaptcha implementation is a little better at thwarting script-driven spammers and vandals, so switch to it for wiki.openstack.org. Note: this is a catch-up patch for implementation already in place in production. Depends-On: I435484cd65a028d774dfd920ca19f3077d4e03fb Change-Id: I9f9ba63399a8885e3694cef37ec987f223ff6dca --- manifests/site.pp | 4 ++-- modules/openstack_project/manifests/wiki.pp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index ccc483dfdd..0213ff54f7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -382,8 +382,8 @@ node 'wiki.openstack.org' { wg_dbpassword => hiera('wiki_wg_dbpassword'), wg_secretkey => hiera('wiki_wg_secretkey'), wg_upgradekey => hiera('wiki_wg_upgradekey'), - wg_recaptchapublickey => hiera('wiki_wg_recaptchapublickey'), - wg_recaptchaprivatekey => hiera('wiki_wg_recaptchaprivatekey'), + wg_recaptchasitekey => hiera('wiki_wg_recaptchasitekey'), + wg_recaptchasecretkey => hiera('wiki_wg_recaptchasecretkey'), wg_googleanalyticsaccount => hiera('wiki_wg_googleanalyticsaccount'), } } diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp index 4bd1cd81d4..8857b943d6 100644 --- a/modules/openstack_project/manifests/wiki.pp +++ b/modules/openstack_project/manifests/wiki.pp @@ -11,8 +11,8 @@ class openstack_project::wiki ( $wg_dbpassword = undef, $wg_secretkey = undef, $wg_upgradekey = undef, - $wg_recaptchapublickey = undef, - $wg_recaptchaprivatekey = undef, + $wg_recaptchasitekey = undef, + $wg_recaptchasecretkey = undef, $wg_googleanalyticsaccount = undef, ) { @@ -48,8 +48,8 @@ class openstack_project::wiki ( wg_dbpassword => $wg_dbpassword, wg_secretkey => $wg_secretkey, wg_upgradekey => $wg_upgradekey, - wg_recaptchapublickey => $wg_recaptchapublickey, - wg_recaptchaprivatekey => $wg_recaptchaprivatekey, + wg_recaptchasitekey => $wg_recaptchasitekey, + wg_recaptchasecretkey => $wg_recaptchasecretkey, wg_googleanalyticsaccount => $wg_googleanalyticsaccount, } class { 'memcached':