From: Julien Cristau Date: Tue, 31 Jul 2018 04:45:48 +0000 (+0200) Subject: Revert "Add ssl to metadata.ftp-master.d.o" X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8a6f86ad8e7da1d84ef781cc4415ede0247fe7ec;p=mirror%2Fdsa-puppet.git Revert "Add ssl to metadata.ftp-master.d.o" I'll try again while actually shipping the key/cert. This reverts commit 5fc26dc04d384d4d6fd687efc9c1b82cdbbb7602. --- 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 75b4451b1..fe78e49bb 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -213,7 +213,7 @@ vhost(lines, "cdbuilder-logs.debian.org" , :ssl => true) vhost(lines, "bits.debian.org" , :ssl => true, :extra => true) vhost(lines, "micronews.debian.org" , :ssl => true) -vhost(lines, "metadata.ftp-master.debian.org", :ssl => true, :ssl_optional => true, :extra => true) +vhost(lines, "metadata.ftp-master.debian.org", :extra => true) vhost(lines, "10years.debconf.org" , :ssl => true) vhost(lines, "debconf0.debconf.org" , :ssl => true)