From: Julien Cristau Date: Sat, 2 Jan 2016 22:36:19 +0000 (+0100) Subject: HTTPS for d-i.debian.org (rt#6049) X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=a7c24ac834c72e8ce97d9bcd6c2bd72a092e400e;p=mirror%2Fdsa-puppet.git 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 --- 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 36290f0e3..80f0a989e 100644 --- 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")