From 4dca9fde53e40437409162b7d5b26e63f6ce97f7 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 14 Jul 2016 19:34:44 +0000 Subject: [PATCH] Setup ReCaptcha in Wiki to Prevent Spam Plumb wg_recaptchapublickey and wg_recaptchaprivatekey variables through from hiera into the mediawiki module for wiki.openstack.org. Change-Id: I0f184c9bfa2bdaaca2478500d8f3b418c9bf77ae Depends-On: Idfa2c01fb9d31f06643d6c82438c33db1ff33009 --- manifests/site.pp | 3 ++- modules/openstack_project/manifests/wiki.pp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 9c43517b5f..5e10f15cb0 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -379,7 +379,8 @@ node 'wiki.openstack.org' { wg_dbpassword => hiera('wiki_wg_dbpassword'), wg_secretkey => hiera('wiki_wg_secretkey'), wg_upgradekey => hiera('wiki_wg_upgradekey'), - wg_captchaquestions => hiera('wiki_wg_captchaquestions'), + wg_recaptchapublickey => hiera('wiki_wg_recaptchapublickey'), + wg_recaptchaprivatekey => hiera('wiki_wg_recaptchaprivatekey'), wg_googleanalyticsaccount => hiera('wiki_wg_googleanalyticsaccount'), } } diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp index 72a0d3656b..3976c17612 100644 --- a/modules/openstack_project/manifests/wiki.pp +++ b/modules/openstack_project/manifests/wiki.pp @@ -9,7 +9,8 @@ class openstack_project::wiki ( $wg_dbpassword = undef, $wg_secretkey = undef, $wg_upgradekey = undef, - $wg_captchaquestions = {}, + $wg_recaptchapublickey = undef, + $wg_recaptchaprivatekey = undef, $wg_googleanalyticsaccount = undef, ) { @@ -42,7 +43,8 @@ class openstack_project::wiki ( wg_dbpassword => $wg_dbpassword, wg_secretkey => $wg_secretkey, wg_upgradekey => $wg_upgradekey, - wg_captchaquestions => $wg_captchaquestions, + wg_recaptchapublickey => $wg_recaptchapublickey, + wg_recaptchaprivatekey => $wg_recaptchaprivatekey, wg_googleanalyticsaccount => $wg_googleanalyticsaccount, } class { 'memcached':