From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 31 May 2018 19:20:44 +0000 (+0200)
Subject: set expires: headers on alioth-archive
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=d63068dc7d8ace2d3fc0b6076b97b798b24e2b08

set expires: headers on alioth-archive
---

diff --git a/modules/roles/manifests/alioth_archive.pp b/modules/roles/manifests/alioth_archive.pp
index 918878968..cafe45807 100644
--- a/modules/roles/manifests/alioth_archive.pp
+++ b/modules/roles/manifests/alioth_archive.pp
@@ -1,5 +1,6 @@
 class roles::alioth_archive {
 	include apache2
+	include apache2::expires
 	include apache2::rewrite
 	include apache2::ssl
 
diff --git a/modules/roles/templates/apache-alioth-archive.debian.org.erb b/modules/roles/templates/apache-alioth-archive.debian.org.erb
index 099c9ef99..8a8f2e342 100644
--- a/modules/roles/templates/apache-alioth-archive.debian.org.erb
+++ b/modules/roles/templates/apache-alioth-archive.debian.org.erb
@@ -19,6 +19,10 @@
 
 	RewriteEngine On
 
+	ExpiresActive On
+	ExpiresDefault "access plus 2 hours"
+	ExpiresByType application/x-xz "access plus 1 week"
+
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>