From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2016 18:14:02 +0000 (+0000)
Subject: move metadata.ftp-master.debian.org to a default with extra
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5463c4ab3827514ab3fbcdab8ed88b89c319ec59;p=mirror%2Fdsa-puppet.git

move metadata.ftp-debian.org to a default with extra
---

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 f2f5a28d9..e10c2f1bb 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -21,6 +21,13 @@
 	</IfModule>
 </Macro>
 
+<Macro vhost-metadata.ftp-master.debian.org-extra>
+	AddDefaultCharset utf-8
+	<LocationMatch "/changelogs/(main|contrib|non-free)">
+		ForceType text/plain
+	</LocationMatch>
+</Macro>
+
 <%=
 
 def vhost(lines, sn, type=nil)
@@ -54,6 +61,7 @@ vhost(lines, "dsa.debian.org"      , "ssl")
 vhost(lines, "rtc.debian.org"      , "ssl")
 
 vhost(lines, "bits.debian.org", "ssl-with-extra")
+vhost(lines, "metadata.ftp-master.debian.org", "with-extra")
 
 vhost(lines, "10years.debconf.org" , "ssl")
 vhost(lines, "debconf0.debconf.org", "ssl")
@@ -73,24 +81,6 @@ vhost(lines, "deb.debian.org", "with-extra")
 lines.join("\n")
 -%>
 
-######################
-# metadata.ftp-master.debian.org
-<% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>
-<VirtualHost <%= vhost_listen %> >
-	ServerName metadata.ftp-master.debian.org
-	ServerAdmin debian-admin@lists.debian.org
-
-	ErrorLog /var/log/apache2/metadata.ftp-master.debian.org-error.log
-	CustomLog /var/log/apache2/metadata.ftp-master.debian.org-access.log privacy
-
-	Use common-static-base metadata.ftp-master.debian.org
-	AddDefaultCharset utf-8
-	<LocationMatch "/changelogs/(main|contrib|non-free)">
-		ForceType text/plain
-	</LocationMatch>
-</VirtualHost>
-<% end -%>
-
 ######################
 # release.debian.org
 <% if scope.function_has_static_component(['release.debian.org']) -%>