add ServerAlias for debian.testing-anycast.mirrors.debian.org

[mirror/dsa-puppet.git] / modules / roles / templates / apache-ftp.debian.org.erb

diff --git a/modules/roles/templates/apache-ftp.debian.org.erb b/modules/roles/templates/apache-ftp.debian.org.erb
index 576eec0..972603d 100644 (file)
--- 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: