Move the Cache-Control setting for package archives to a macro

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

diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index c9c88af..42c3fb2 100644 (file)
--- 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>
-
-