From: Julien Cristau Date: Tue, 31 Jul 2018 06:34:54 +0000 (+0200) Subject: Fix metadata-backend.ftp-master.d.o redirects X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=26e6a6719a872fd0cb8449f3604ab17c65b08261;p=mirror%2Fdsa-puppet.git 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 6d9acf92d..ca437c7bc 100644 --- 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']) -%> > - 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