add ServerAlias for debian.testing-anycast.mirrors.debian.org
[mirror/dsa-puppet.git] / modules / roles / templates / apache-ftp.debian.org.erb
index 98841dc..972603d 100644 (file)
@@ -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: