From 9bc75ed17be8244d5facecba88281859c403230c Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Mon, 22 Aug 2016 19:45:12 +0000
Subject: [PATCH] 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
---
 hiera/common.yaml                           | 1 +
 manifests/site.pp                           | 1 +
 modules/openstack_project/manifests/wiki.pp | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index 0bb750ec81..6a1c3ffb9b 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -30,6 +30,7 @@ elasticsearch_clients:
 - logstash-worker20.openstack.org
 - subunit-worker01.openstack.org
 - subunit-worker02.openstack.org
+infra_apache_serveradmin: noc@openstack.org
 statusbot_channels:
 - ara
 - congress
diff --git a/manifests/site.pp b/manifests/site.pp
index a985d046f3..caef7468d7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -373,6 +373,7 @@ node 'etherpad-dev.openstack.org' {
 node 'wiki.openstack.org' {
   class { 'openstack_project::wiki':
     sysadmins                 => hiera('sysadmins', []),
+    serveradmin               => hiera('infra_apache_serveradmin'),
     ssl_cert_file_contents    => hiera('ssl_cert_file_contents'),
     ssl_key_file_contents     => hiera('ssl_key_file_contents'),
     ssl_chain_file_contents   => hiera('ssl_chain_file_contents'),
diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp
index 8857b943d6..0e605d7b60 100644
--- a/modules/openstack_project/manifests/wiki.pp
+++ b/modules/openstack_project/manifests/wiki.pp
@@ -2,6 +2,7 @@
 #
 class openstack_project::wiki (
   $sysadmins = [],
+  $serveradmin = undef,
   $ssl_cert_file_contents = '',
   $ssl_key_file_contents = '',
   $ssl_chain_file_contents = '',
@@ -35,6 +36,7 @@ class openstack_project::wiki (
     role                       => 'all',
     mediawiki_location         => '/srv/mediawiki/w',
     mediawiki_images_location  => '/srv/mediawiki/images',
+    serveradmin                => $serveradmin,
     site_hostname              => $::fqdn,
     ssl_cert_file              => "/etc/ssl/certs/${::fqdn}.pem",
     ssl_key_file               => "/etc/ssl/private/${::fqdn}.key",