HTTPS for d-i.debian.org (rt#6049)

Drop the ServerAlias, we're not using it and the ssl macro doesn't mix
with extra.

Signed-off-by: Julien Cristau <jcristau@debian.org>

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 36290f0..80f0a98 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -25,11 +25,11 @@ vhost(lines, "news.debian.net")
 vhost(lines, "debaday.debian.net")
 vhost(lines, "debdeltas.debian.net")
 vhost(lines, "timeline.debian.net")
-vhost(lines, "d-i.debian.org"          , "with-extra", '"ServerAlias d-i-backend.debian.org"')
 vhost(lines, "network-test.debian.org" , "with-extra", '"ServerAlias network-test-backend.debian.org"')
 vhost(lines, "blends.debian.org"       , "with-extra", '"ServerAlias blends-backend.debian.org"')
 vhost(lines, "wnpp-by-tags.debian.net" , "with-extra", '"ServerAlias wnpp-by-tags-backend.debian.org"')
 vhost(lines, "security-team.debian.org", "with-extra", '"ServerAlias security-team-backend.debian.org"')
+vhost(lines, "d-i.debian.org"      , "ssl")
 vhost(lines, "appstream.debian.org", "ssl")
 vhost(lines, "dsa.debian.org"      , "ssl")
 vhost(lines, "rtc.debian.org"      , "ssl")