X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=972603db4577fddbd678e8961a6656769f6de8c6;hb=7f18f21c8a9d538bac4a1ae874b492a80f432623;hp=576eec0fa74b88ed44acd3820823ef63a9e9fe89;hpb=8d3ad68faaf8d0b4e555055b8eb22b42a930c0b1;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 576eec0fa..972603db4 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -4,8 +4,9 @@
 ##
 
 <VirtualHost <%= vhost_listen %>>
-	ServerAdmin webmaster@debian.org
+	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 %>
@@ -17,6 +18,10 @@
 	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: