From: Julien Cristau <jcristau@debian.org>
Date: Wed, 27 Jul 2016 16:39:48 +0000 (+0200)
Subject: Set Cache-Control header for debian-debug and debian-ports archives
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4fc14bac881aec79c74fb4cf743d9a85cf681c4a;p=mirror%2Fdsa-puppet.git

Set Cache-Control header for debian-debug and debian-ports archives

Set max-age to 2 minutes for dists, 30 days for by-hash and pool, to
match ftp.debian.org.

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
index f20d4b609..7a5a5923a 100644
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -20,6 +20,22 @@
                 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>
+
 </VirtualHost>
 
 
diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index 285d00872..c9c88af89 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -21,6 +21,21 @@
                 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>
 
         Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
         <Directory /srv/mirrors/debian-ports-cd>