From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Feb 2017 07:40:42 +0000 (+0100)
Subject: Serve the archive on / and on /debian-archive/
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9e463e9bf00a041a0b094f4b91da9a17ceef9463;p=mirror%2Fdsa-puppet.git

Serve the archive on / and on /debian-archive/
---

diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb
index 8762ab58a..a4b1f9cf0 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -10,7 +10,8 @@
 	ServerAlias <%= scope.function_onion_global_service_hostname(['archive.debian.org']) %>
 	<% end %>
 
-	RedirectMatch "^/$" /debian-archive/
+	#RedirectMatch "^/$" /debian-archive/
+	DocumentRoot <%= archive_root %>/
 	Alias /debian-archive/ <%= archive_root %>/
 
 	ErrorLog /var/log/apache2/archive.debian.org-error.log