opendev
/
system-config
Code Issues Proposed changes

Set the Apache ServerAdmin on wiki.o.o from hiera 

Our mediawiki module now allows setting the ServerAdmin in its
Apache vhost config as a class parameter. Fill it from hiera so that
people copying our global site manifest don't inadvertently
configure servers to list us as their webmaster.

Change-Id: I280d8fdf3f8c53d4a105b1739f7d0af83031d0b4
This commit is contained in:
Jeremy Stanley 2016-08-22 19:45:12 +00:00
parent 9453dd8a83
commit 9bc75ed17b
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@ -30,6 +30,7 @@ elasticsearch_clients:
- logstash-worker20.openstack.org - logstash-worker20.openstack.org
- subunit-worker01.openstack.org - subunit-worker01.openstack.org
- subunit-worker02.openstack.org - subunit-worker02.openstack.org
infra_apache_serveradmin: noc@openstack.org
statusbot_channels: statusbot_channels:
- ara - ara
- congress - congress

1
manifests/site.pp
View File

@ -373,6 +373,7 @@ node 'etherpad-dev.openstack.org' {
node 'wiki.openstack.org' { node 'wiki.openstack.org' {
class { 'openstack_project::wiki': class { 'openstack_project::wiki':
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
serveradmin => hiera('infra_apache_serveradmin'),
ssl_cert_file_contents => hiera('ssl_cert_file_contents'), ssl_cert_file_contents => hiera('ssl_cert_file_contents'),
ssl_key_file_contents => hiera('ssl_key_file_contents'), ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_chain_file_contents => hiera('ssl_chain_file_contents'), ssl_chain_file_contents => hiera('ssl_chain_file_contents'),

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

@ -2,6 +2,7 @@
# #
class openstack_project::wiki ( class openstack_project::wiki (
$sysadmins = [], $sysadmins = [],
$serveradmin = undef,
$ssl_cert_file_contents = '', $ssl_cert_file_contents = '',
$ssl_key_file_contents = '', $ssl_key_file_contents = '',
$ssl_chain_file_contents = '', $ssl_chain_file_contents = '',
@ -35,6 +36,7 @@ class openstack_project::wiki (
role => 'all', role => 'all',
mediawiki_location => '/srv/mediawiki/w', mediawiki_location => '/srv/mediawiki/w',
mediawiki_images_location => '/srv/mediawiki/images', mediawiki_images_location => '/srv/mediawiki/images',
serveradmin => $serveradmin,
site_hostname => $::fqdn, site_hostname => $::fqdn,
ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem", ssl_cert_file => "/etc/ssl/certs/${::fqdn}.pem",
ssl_key_file => "/etc/ssl/private/${::fqdn}.key", ssl_key_file => "/etc/ssl/private/${::fqdn}.key",