opendev/system-config
Code Issues Proposed changes

Merge "Disallow robots for wiki-dev site"

Browse Source
This commit is contained in:
Jenkins 2016-09-08 19:19:30 +00:00 committed by Gerrit Code Review
commit 23451e661e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -407,6 +407,7 @@ node /^wiki-dev\d+\.openstack\.org$/ {
wg_upgradekey => hiera('wg_upgradekey'), wg_upgradekey => hiera('wg_upgradekey'),
wg_recaptchasitekey => hiera('wg_recaptchasitekey'), wg_recaptchasitekey => hiera('wg_recaptchasitekey'),
wg_recaptchasecretkey => hiera('wg_recaptchasecretkey'), wg_recaptchasecretkey => hiera('wg_recaptchasecretkey'),
disallow_robots => true,
} }
} }

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

@ -17,6 +17,7 @@ class openstack_project::wiki (
$wg_recaptchasitekey = undef, $wg_recaptchasitekey = undef,
$wg_recaptchasecretkey = undef, $wg_recaptchasecretkey = undef,
$wg_googleanalyticsaccount = undef, $wg_googleanalyticsaccount = undef,
$disallow_robots = undef,
) { ) {
package { ['openssl', 'ssl-cert', 'subversion']: package { ['openssl', 'ssl-cert', 'subversion']:
@ -54,6 +55,7 @@ class openstack_project::wiki (
wg_googleanalyticsaccount => $wg_googleanalyticsaccount, wg_googleanalyticsaccount => $wg_googleanalyticsaccount,
wg_sitename => 'OpenStack', wg_sitename => 'OpenStack',
wg_logo => "https://${site_hostname}/w/images/thumb/c/c4/OpenStack_Logo_-_notext.png/30px-OpenStack_Logo_-_notext.png", wg_logo => "https://${site_hostname}/w/images/thumb/c/c4/OpenStack_Logo_-_notext.png/30px-OpenStack_Logo_-_notext.png",
disallow_robots => $disallow_robots,
} }
class { 'memcached': class { 'memcached':
max_memory => 2048, max_memory => 2048,