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 0475c03..972603d 100644 (file)
--- 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: