opendev/system-config
Code Issues Proposed changes

Merge "Setup ReCaptcha in Wiki to Prevent Spam"

Browse Source
This commit is contained in:
Jenkins 2016-07-19 04:30:26 +00:00 committed by Gerrit Code Review
commit 7dc70fe8b2
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

@ -377,7 +377,8 @@ node 'wiki.openstack.org' {
wg_dbpassword => hiera('wiki_wg_dbpassword'), wg_dbpassword => hiera('wiki_wg_dbpassword'),
wg_secretkey => hiera('wiki_wg_secretkey'), wg_secretkey => hiera('wiki_wg_secretkey'),
wg_upgradekey => hiera('wiki_wg_upgradekey'), 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'), 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_dbpassword = undef,
$wg_secretkey = undef, $wg_secretkey = undef,
$wg_upgradekey = undef, $wg_upgradekey = undef,
$wg_captchaquestions = {}, $wg_recaptchapublickey = undef,
$wg_recaptchaprivatekey = undef,
$wg_googleanalyticsaccount = undef, $wg_googleanalyticsaccount = undef,
) { ) {
@ -42,7 +43,8 @@ class openstack_project::wiki (
wg_dbpassword => $wg_dbpassword, wg_dbpassword => $wg_dbpassword,
wg_secretkey => $wg_secretkey, wg_secretkey => $wg_secretkey,
wg_upgradekey => $wg_upgradekey, wg_upgradekey => $wg_upgradekey,
wg_captchaquestions => $wg_captchaquestions, wg_recaptchapublickey => $wg_recaptchapublickey,
wg_recaptchaprivatekey => $wg_recaptchaprivatekey,
wg_googleanalyticsaccount => $wg_googleanalyticsaccount, wg_googleanalyticsaccount => $wg_googleanalyticsaccount,
} }
class { 'memcached': class { 'memcached':