From 26e6a6719a872fd0cb8449f3604ab17c65b08261 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 31 Jul 2018 08:34:54 +0200 Subject: [PATCH] Fix metadata-backend.ftp-master.d.o redirects --- .../static-mirroring/vhost/static-vhosts-simple.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.20.1