X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-ftp.ports.debian.org.erb;h=42c3fb24d81df4be4d19d22320d8f90056a29083;hb=f547f56074ec88b2900d361e435d37ddb3b9ce3f;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..42c3fb24d 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -21,21 +21,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 +31,3 @@
                 Options +FollowSymLinks
         </Directory>
 </VirtualHost>
-
-