X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-ftp.ports.debian.org.erb;h=5a060ce203617507f360a0e47e4a9e2e8e3786c8;hb=0aa459dd4a50208a2c12de4923a1b4d5702cc375;hp=c9c88af894ff2f819793582269145ea648f578f5;hpb=4fc14bac881aec79c74fb4cf743d9a85cf681c4a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index c9c88af89..5a060ce20 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -6,7 +6,9 @@
 <VirtualHost <%= vhost_listen %> >
         ServerAdmin debian-admin@debian.org
         ServerName ftp.ports.debian.org
-
+        <% if scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) -%>
+        ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) %>
+        <% end %>
 
         ErrorLog /var/log/apache2/ftp.ports.debian.org-error.log
         LogLevel warn
@@ -21,21 +23,7 @@
                 Options +Indexes
                 Options +FollowSymLinks
         </Directory>
-        <Directory /srv/mirrors/debian-ports/pool>
-                <Files ?*>
-                        Header set Cache-Control "public, max-age=2592000"
-                </Files>
-        </Directory>
-        <Directory /srv/mirrors/debian-ports/dists>
-                <Files ?*>
-                        Header set Cache-Control "public, max-age=120"
-                </Files>
-        </Directory>
-        <DirectoryMatch "^/srv/mirrors/debian-ports/dists/.*/by-hash">
-                <Files ?*>
-                        Header set Cache-Control "public, max-age=2592000"
-                </Files>
-        </DirectoryMatch>
+        Use ftp-archive /srv/mirrors/debian-ports
 
         Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
         <Directory /srv/mirrors/debian-ports-cd>
@@ -45,5 +33,3 @@
                 Options +FollowSymLinks
         </Directory>
 </VirtualHost>
-
-