From f2b5e3d05fe77fad51533389411508c6c1add59a Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Tue, 5 Dec 2017 09:31:17 +0100
Subject: [PATCH] Fixup sources.d.n setup

No static component means no vhost generated by the usual macros.
---
 .../vhost/static-vhosts-simple.erb                 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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 30a186eaa..42759a34a 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -158,10 +158,6 @@
 	</FilesMatch>
 </Macro>
 
-<Macro vstatic-vhost-extra-sources.debian.net>
-	Redirect permanent / https://sources.debian.org/
-</Macro>
-
 <%=
 
 def vhost(lines, sn, kwargs={})
@@ -195,7 +191,6 @@ end
 
 lines = []
 vhost(lines, "mozilla.debian.net"            , :ssl => true, :ssl_optional => true)
-vhost(lines, "sources.debian.net"            , :ssl => true, :extra => true)
 vhost(lines, "backports.debian.org"          , :ssl => true)
 vhost(lines, "incoming.debian.org"           , :ssl => true, :ssl_optional => true)
 vhost(lines, "incoming.ports.debian.org"     , :ssl => true, :ssl_optional => true)
@@ -349,6 +344,15 @@ lines.join("\n")
 	Redirect / https://manpages.debian.org/
 </VirtualHost>
 
+Use common-dsa-vhost-https-redirect sources.debian.net
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName sources.debian.net
+	ServerAdmin debian-admin@debian.org
+	Use common-debian-service-ssl sources.debian.net
+	Use common-ssl-HSTS
+	Redirect permanent / https://sources.debian.org/
+</VirtualHost>
+
 # error pages
 #############
 
-- 
2.20.1