X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-debug.mirrors.debian.org.erb;h=5d2ac23eb9155eb93e4036b49f17aebfb34b3ca9;hb=c2f13d4cf63d9d2143ebe02109eb5f157e4eea73;hp=7a5a5923a626223c90ea46b697b0c3e5d4e2564f;hpb=4fc14bac881aec79c74fb4cf743d9a85cf681c4a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
index 7a5a5923a..5d2ac23eb 100644
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -6,6 +6,9 @@
 <VirtualHost <%= vhost_listen %> >
         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,22 +23,5 @@
                 Options +Indexes
                 Options +FollowSymLinks
         </Directory>
-        <Directory /srv/mirrors/debian-debug/pool>
-                <Files ?*>
-                        Header set Cache-Control "public, max-age=2592000"
-                </Files>
-        </Directory>
-        <Directory /srv/mirrors/debian-debug/dists>
-                <Files ?*>
-                        Header set Cache-Control "public, max-age=120"
-                </Files>
-        </Directory>
-        <DirectoryMatch "^/srv/mirrors/debian-debug/dists/.*/by-hash">
-                <Files ?*>
-                        Header set Cache-Control "public, max-age=2592000"
-                </Files>
-        </DirectoryMatch>
-
+        Use ftp-archive /srv/mirrors/debian-debug
 </VirtualHost>
-
-