X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-archive.debian.org.erb;h=e8d84409dee3101fcb88c12397a1583701037398;hb=a4306b2a5d8694309b25e08cd111edf9c3967ec1;hp=a4b1f9cf07aeca574def294e152405bf1486f4f5;hpb=9e463e9bf00a041a0b094f4b91da9a17ceef9463;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 a4b1f9cf0..e8d84409d 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -3,23 +3,24 @@
 ## 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/
-	DocumentRoot <%= archive_root %>/
-	Alias /debian-archive/ <%= archive_root %>/
+	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
 
-	<Directory <%= archive_root %>>
+	<Directory <%= @archive_root %>>
 		Require all granted
-		IndexOptions NameWidth=* +SuppressDescription
 		Options +Indexes +FollowSymLinks
 	</Directory>