Make metadata-backend.ftp-master hopefully work

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 0af5e2a..6d9acf9 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -73,10 +73,6 @@
        </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
@@ -218,7 +214,6 @@ 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-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)
@@ -329,6 +324,17 @@ Use common-dsa-vhost-https-redirect video.debconf.org
        Redirect / https://debconf-video-team.pages.debian.net/docs/
 </VirtualHost>
 
+<% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName metadata-backend.ftp-master.debian.org
+       Use common-debian-service-ssl metadata-backend.ftp-master.debian.org
+       ErrorLog /var/log/apache2/metadata-backend.ftp-master.debian.org-error.log
+       CustomLog /var/log/apache2/metadata-backend.ftp-master.debian.org-access.log privacy
+
+       Use static-vhost-base-metadata.ftp-master.debian.org
+</VirtualHost>
+<% end -%>
+
 # historical sites
 ##################
 # now only redirects remain