From e9c182207bf901dd7689986fc02e5c4e24c4553a Mon Sep 17 00:00:00 2001
From: Paul Wise <pabs@debian.org>
Date: Wed, 25 Jul 2018 11:26:34 +0800
Subject: [PATCH] Add www-staging vhost

It was broken when the website moved to the static.d.o CDN
---
 modules/roles/manifests/static_mirror.pp          |  1 +
 modules/roles/manifests/www_master.pp             | 12 ++++++++++++
 modules/roles/templates/apache-www.debian.org.erb | 14 ++++++--------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 537c79d9e..c15063763 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -78,6 +78,7 @@ class roles::static_mirror {
 		content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
 	}
 
+	$wwwdo_server_name = 'www.debian.org'
 	$wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
 	apache2::site { '005-www.debian.org':
 		site   => 'www.debian.org',
diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index aabe5f23e..bc37aa863 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -3,4 +3,16 @@ class roles::www_master {
 		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
+
+	$wwwdo_server_name = 'www-staging.debian.org'
+	$wwwdo_document_root = '/srv/www.debian.org/www'
+	apache2::site { '005-www-staging.debian.org':
+		site    => 'www-staging.debian.org',
+		content => template('roles/apache-www.debian.org.erb'),
+	}
+
+	ssl::service { 'www-staging.debian.org' :
+		notify => Exec['service apache2 reload'],
+		key    => true,
+	}
 }
diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index ed50778d8..afcd63df3 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -268,8 +268,7 @@
 </Macro>
 
 <Macro common-www.d.o>
-   ServerName www.debian.org
-   ServerAlias www-*.debian.org
+   ServerName <%= @wwwdo_server_name %>
 
    Use common-www.d.o-inner
 </Macro>
@@ -279,8 +278,8 @@
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacy
 
-   ServerName www.debian.org
-   Redirect / https://www.debian.org/
+   ServerName <%= @wwwdo_server_name %>
+   Redirect / https://<%= @wwwdo_server_name %>/
 </VirtualHost>
 <VirtualHost <%= @vhost_listen_443 %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
@@ -288,16 +287,15 @@
 
    Use common-www.d.o
 
-   Use common-debian-service-ssl www.debian.org
+   Use common-debian-service-ssl <%= @wwwdo_server_name %>
    Use common-ssl-HSTS
 </VirtualHost>
-
-<% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
+<% if scope.function_onion_global_service_hostname([@wwwdo_server_name]) -%>
 <VirtualHost <%= @vhost_listen %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacy
 
-   ServerName <%= scope.function_onion_global_service_hostname(['www.debian.org']) %>
+   ServerName <%= scope.function_onion_global_service_hostname([@wwwdo_server_name]) %>
 
    Use common-www.d.o-inner
 </VirtualHost>
-- 
2.20.1