Remove leap second config for debian <= 7

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

diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
index e29a23c..5d2ac23 100644 (file)
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -4,8 +4,11 @@
 ##
 
 <VirtualHost <%= vhost_listen %> >
-        ServerAdmin webmaster@debian.org
+        ServerAdmin debian-admin@debian.org
         ServerName debug.mirrors.debian.org
+        <% if scope.function_onion_global_service_hostname(['debug.mirrors.debian.org']) -%>
+        ServerAlias <%= scope.function_onion_global_service_hostname(['debug.mirrors.debian.org']) %>
+        <% end %>
 
         RedirectMatch "^/$" /debian-debug/
         Alias /debian-debug /srv/mirrors/debian-debug
@@ -20,6 +23,5 @@
                 Options +Indexes
                 Options +FollowSymLinks
         </Directory>
+        Use ftp-archive /srv/mirrors/debian-debug
 </VirtualHost>
-
-