X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=972603db4577fddbd678e8961a6656769f6de8c6;hb=7f18f21c8a9d538bac4a1ae874b492a80f432623;hp=0475c0348b2e37567949fbabdd2f314c89b47ccf;hpb=1aef32ebbf34d9045610f61baddbabe0384e09f1;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 0475c0348..972603db4 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -3,18 +3,25 @@
 ## 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.testing-anycast.mirrors.debian.org
+	<% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%>
+	ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %>
+	<% end %>
 
-        ErrorLog /var/log/apache2/ftp.debian.org-error.log
-        CustomLog /var/log/apache2/ftp.debian.org-access.log privacy
+	RedirectMatch "^/$" /debian/
+	Alias /debian/ <%= archive_root %>/
 
-        Use ftp-archive /srv/ftp.debian.org/ftp.root/debian
+	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: