From 1d63ce0e54d6f59f6edb0abff0183bc30c86ec64 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 1 Jun 2018 10:58:43 +0200
Subject: [PATCH] nagios master: apache vhost

---
 modules/nagios/manifests/server.pp            | 10 +++++
 .../templates/nagios.debian.org.conf.erb      | 40 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 modules/nagios/templates/nagios.debian.org.conf.erb

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index ab584052a..cc28ff46e 100644
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -1,8 +1,18 @@
 class nagios::server {
+	include apache2
+	include apache2::ssl
+	include apache2::auth_digest
+	include apache2::authn_anon
+	include apache2::proxy_http
+
 	ssl::service { 'nagios.debian.org':
 		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
+	apache2::site { "10-nagios.debian.org":
+		site => "nagios.debian.org",
+		content => template('nagios/nagios.debian.org.conf.erb'),
+	}
 
 	concat::fragment { 'dsa-puppet-stuff--nagios--restart-stale-icinga':
 		target => '/etc/cron.d/dsa-puppet-stuff',
diff --git a/modules/nagios/templates/nagios.debian.org.conf.erb b/modules/nagios/templates/nagios.debian.org.conf.erb
new file mode 100644
index 000000000..bc5789496
--- /dev/null
+++ b/modules/nagios/templates/nagios.debian.org.conf.erb
@@ -0,0 +1,40 @@
+Use common-debian-service-https-redirect * nagios.debian.org
+
+<VirtualHost *:443>
+        ServerAdmin webmaster@debian.org
+        ServerName icinga.debian.org
+        ServerAlias nagios
+
+        Use common-debian-service-ssl nagios.debian.org
+        Use common-ssl-HSTS
+        Use http-pkp-nagios.debian.org
+
+        ErrorLog /var/log/apache2/nagios.debian.org-error.log
+        LogLevel warn
+        CustomLog /var/log/apache2/nagios.debian.org-access.log combined
+        ServerSignature On
+        <IfModule mod_userdir.c>
+                UserDir disabled
+        </IfModule>
+        DocumentRoot /srv/nagios.debian.org/htdocs
+        <Directory />
+                Options FollowSymLinks
+                AllowOverride None
+        </Directory>
+        <Directory /srv/nagios.debian.org/htdocs/>
+                Options -Indexes +FollowSymLinks +MultiViews
+                AllowOverride None
+        </Directory>
+
+        AddOutputFilterByType DEFLATE text/json
+        Include "/etc/icinga/apache2.conf"
+
+        RedirectMatch ^/$ /icinga/
+        RedirectMatch ^/nagios$ /icinga
+        RedirectMatch ^/nagios/$ /icinga/
+        RedirectMatch ^/nagios3$ /icinga/
+        RedirectMatch ^/nagios3/$ /icinga/
+
+        Header always set Referrer-Policy "same-origin"
+</VirtualHost>
+# vim:set syntax=apache:
-- 
2.20.1