opendev/system-config
Code Issues Proposed changes

Merge "Switch wiki.o.o to recaptcha-nocaptcha"

Browse Source
This commit is contained in:
Jenkins
2016-08-28 14:14:24 +00:00
committed by Gerrit Code Review
parent dd8ef93d58 f74bcccbb0
commit 47bea7a62a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

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

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

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