opendev/system-config
Code Issues Proposed changes

Setup ReCaptcha in Wiki to Prevent Spam

Browse Source 
Plumb wg_recaptchapublickey and wg_recaptchaprivatekey variables
through from hiera into the mediawiki module for wiki.openstack.org.

Change-Id: I0f184c9bfa2bdaaca2478500d8f3b418c9bf77ae
Depends-On: Idfa2c01fb9d31f06643d6c82438c33db1ff33009
This commit is contained in:
Jeremy Stanley 2016-07-14 19:34:44 +00:00
parent 65bab038bc
commit 4dca9fde53
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -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'),
}
}

6
modules/openstack_project/manifests/wiki.pp
View File

@ -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':