Fix metadata-backend.ftp-master.d.o redirects

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 6d9acf9..ca437c7 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -326,7 +326,10 @@ Use common-dsa-vhost-https-redirect video.debconf.org
 
 <% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>
 <VirtualHost <%= @vhost_listen_443 %> >
-       ServerName metadata-backend.ftp-master.debian.org
+       ServerName metadata.ftp-master.debian.org
+       ServerAlias metadata-backend.ftp-master.debian.org
+       # all self-referential URLs should use the public host name
+       UseCanonicalName On
        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