From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Feb 2017 07:37:39 +0000 (+0100)
Subject: archive.d.o is not your standard archive layout
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5206e744c55b4175e096c8d3ffdace18ad42b7a8;p=mirror%2Fdsa-puppet.git

archive.d.o is not your standard archive layout
---

diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb
index 611b27c5f..8762ab58a 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -16,7 +16,14 @@
 	ErrorLog /var/log/apache2/archive.debian.org-error.log
 	CustomLog /var/log/apache2/archive.debian.org-access.log privacy
 
-	Use ftp-archive <%= archive_root %>
+	<Directory <%= archive_root %>>
+		Require all granted
+		IndexOptions NameWidth=* +SuppressDescription
+		Options +Indexes +FollowSymLinks
+	</Directory>
+
+	ExpiresActive On
+	ExpiresDefault "access plus 1 day"
 
 	<IfModule mod_userdir.c>
 		UserDir disabled