From 2750ccc51b2913146b9284aaec444f4ced4b65ec Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Thu, 17 Jan 2019 16:04:07 +0100
Subject: [PATCH] Add www.debconf.org vhost on static

---
 modules/roles/manifests/static_mirror.pp               |  1 +
 .../static-mirroring/vhost/static-vhosts-simple.erb    | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 00fcc9a84..c7d30916d 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -157,6 +157,7 @@ class roles::static_mirror {
 	ssl::service { 'miniconf10.debconf.org'        : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'video.debconf.org'             : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'wiki.debconf.org'              : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'www.debconf.org'               : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 
 	if has_role('static_mirror_onion') {
 		if ! $onion_v4_addr {
diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index f9dd94137..7ae70fb87 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -194,6 +194,16 @@
 	RewriteRule ^/load.php$ /load-jquery.checkbox.js [L,QSD]
 </Macro>
 
+<Macro vstatic-vhost-extra-www.debconf.org>
+	ServerAlias www-test.debconf.org
+
+	<Directory /srv/static.debian.org/mirrors/www.debconf.org/cur>
+		Options +Includes
+	</Directory>
+
+	AddOutputFilter INCLUDES .shtml
+</Macro>
+
 <%=
 
 def vhost(lines, sn, kwargs={})
-- 
2.20.1