X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=534c8b142a411da3025e593a163b77504a5c4d8f;hb=5bcf8431d6b375d211a29f9d2c338e4400332e1a;hp=972603db4577fddbd678e8961a6656769f6de8c6;hpb=f244ad41d464fa999063b6e9ff9ea36c3a3f6a1d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-ftp.debian.org.erb b/modules/roles/templates/apache-ftp.debian.org.erb
index 972603db4..534c8b142 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -3,21 +3,25 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost <%= vhost_listen %>>
+<VirtualHost <%= @vhost_listen %>>
 	ServerAdmin debian-admin@debian.org
 	ServerName ftp.debian.org
-	ServerAlias debian.testing-anycast.mirrors.debian.org
+	ServerAlias debian.anycast-test.mirrors.debian.org
 	<% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%>
 	ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %>
 	<% end %>
+	ServerAlias debian.backend.mirrors.debian.org
+	ServerAlias *.debian.backend.mirrors.debian.org
+
+	AddCharset UTF-8 .txt
 
 	RedirectMatch "^/$" /debian/
-	Alias /debian/ <%= archive_root %>/
+	Alias /debian/ <%= @archive_root %>/
 
 	ErrorLog /var/log/apache2/ftp.debian.org-error.log
 	CustomLog /var/log/apache2/ftp.debian.org-access.log privacy
 
-	Use ftp-archive <%= archive_root %>
+	Use ftp-archive <%= @archive_root %>
 
 	<IfModule mod_userdir.c>
 		UserDir disabled