X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.debian.org.erb;h=972603db4577fddbd678e8961a6656769f6de8c6;hb=f244ad41d464fa999063b6e9ff9ea36c3a3f6a1d;hp=a34002b11801c9e773a2e4b653a161927541c726;hpb=4981581e188e970c4e711b2992a99c492a5a9f35;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 a34002b11..972603db4 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -4,19 +4,24 @@
 ##
 
 <VirtualHost <%= vhost_listen %>>
-        ServerAdmin webmaster@debian.org
-        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 %>
+	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 %>
 
-        RedirectMatch "^/$" /debian/
-        Alias /debian/ <%= archive_root %>/
+	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
+	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
+	</IfModule>
 </VirtualHost>
 
 # vim:set syn=apache: