X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Froles%2Ftemplates%2Fapache-archive.debian.org.erb;h=e8d84409dee3101fcb88c12397a1583701037398;hb=d37aae2f20083c472de30925ff3e16a692408a11;hp=611b27c5f293dc1719f298e428595b075e5ea01e;hpb=159f9d320359cb17eb3e10006ab1ace4f4900df6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb
index 611b27c5f..e8d84409d 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -3,20 +3,29 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost <%= vhost_listen %>>
+<VirtualHost <%= @vhost_listen %>>
 	ServerAdmin debian-admin@debian.org
 	ServerName archive.debian.org
 	<% if scope.function_onion_global_service_hostname(['archive.debian.org']) -%>
 	ServerAlias <%= scope.function_onion_global_service_hostname(['archive.debian.org']) %>
 	<% end %>
+	ServerAlias archive.backend.mirrors.debian.org
+	ServerAlias *.archive.backend.mirrors.debian.org
 
-	RedirectMatch "^/$" /debian-archive/
-	Alias /debian-archive/ <%= archive_root %>/
+	#RedirectMatch "^/$" /debian-archive/
+	DocumentRoot <%= @archive_root %>/
+	Alias /debian-archive/ <%= @archive_root %>/
 
 	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
+		Options +Indexes +FollowSymLinks
+	</Directory>
+
+	ExpiresActive On
+	ExpiresDefault "access plus 1 day"
 
 	<IfModule mod_userdir.c>
 		UserDir disabled