X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=534c8b142a411da3025e593a163b77504a5c4d8f;hb=cb406afb7d640308d5fc9b25fef6f8512d8e24b6;hp=8e512153ba698ddc4258e90433bf177180d1065f;hpb=c19a1cc33a2207247bb2f1155802700080fdc6fd;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 8e512153b..534c8b142 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -3,18 +3,29 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost <%= vhost_listen %>>
-        ServerAdmin webmaster@debian.org
-        DocumentRoot /srv/ftp.debian.org/ftp.root
-        ServerName ftp.debian.org
-        <% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%>
-        ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %>
-        <% end %>
+<VirtualHost <%= @vhost_listen %>>
+	ServerAdmin debian-admin@debian.org
+	ServerName ftp.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
 
-        ErrorLog /var/log/apache2/ftp.debian.org-error.log
-        CustomLog /var/log/apache2/ftp.debian.org-access.log privacy
+	AddCharset UTF-8 .txt
 
-        Use ftp-archive /srv/ftp.debian.org/ftp.root/debian
+	RedirectMatch "^/$" /debian/
+	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 %>
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </VirtualHost>
 
 # vim:set syn=apache: