From: Julien Cristau <jcristau@debian.org>
Date: Tue, 31 Jul 2018 05:22:48 +0000 (+0200)
Subject: Make metadata-backend its own vhost and move ssl setup there
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=faa463cbb289909766d46113730bf651629f0979;p=mirror%2Fdsa-puppet.git

Make metadata-backend its own vhost and move ssl setup there
---

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9b3461aee..4ecb862ca 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -110,7 +110,11 @@ 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 { 'metadata-backend.ftp-master.debian.org':
+		ensure => has_static_component('metadata.ftp-master.debian.org') ? { true => "present", false => "absent" },
+		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 025223f80..0af5e2ab3 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -61,7 +61,6 @@
 </Macro>
 
 <Macro vstatic-vhost-extra-metadata.ftp-master.debian.org>
-	ServerAlias metadata-backend.ftp-master.debian.org
 	AddDefaultCharset utf-8
 
 	# Rewrite away double slashes
@@ -74,6 +73,10 @@
 	</LocationMatch>
 </Macro>
 
+<Macro vstatic-vhost-extra-metadata-backend.ftp-master.debian.org>
+	Use vstatic-vhost-extra-metadata.ftp-master.debian.org>
+</Macro>
+
 <Macro vstatic-vhost-extra-release.debian.org>
 	RewriteEngine	on
 	RewriteRule		^/migration/$			/migration/testing.pl
@@ -214,7 +217,8 @@ 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, "metadata-backend.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)