From: Julien Cristau <jcristau@debian.org>
Date: Tue, 31 Jul 2018 04:39:58 +0000 (+0200)
Subject: Add ssl to metadata.ftp-master.d.o
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=48de59ea77b6538762ed41174f048347bddca876;p=mirror%2Fdsa-puppet.git

Add ssl to metadata.ftp-master.d.o
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9291c3d8f..9b3461aee 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -110,6 +110,7 @@ class roles::static_mirror {
 	ssl::service { 'lintian.debian.org'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'lists.alioth.debian.org'       : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'manpages.debian.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'metadata.ftp-master.debian.org': ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'mirror-master.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'onion.debian.org'              : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'pkg-ruby-extras.alioth.debian.org' : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
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 fe78e49bb..75b4451b1 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", :extra => true)
+vhost(lines, "metadata.ftp-master.debian.org", :ssl => true, :ssl_optional => true, :extra => true)
 
 vhost(lines, "10years.debconf.org"           , :ssl => true)
 vhost(lines, "debconf0.debconf.org"          , :ssl => true)