X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=ca437c7bc6c6ab6349fac15652a4286bfd1901a3;hb=26e6a6719a872fd0cb8449f3604ab17c65b08261;hp=6d9acf92d532470366b010ccb0732535a1f7a12a;hpb=9d7c292a9d8ea8d20c38b6dacf7376ea24c9c4e0;p=mirror%2Fdsa-puppet.git 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