X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-archive.debian.org.erb;h=e8d84409dee3101fcb88c12397a1583701037398;hb=a0d0b0d1b7a695b32e9078d6f551249861c775b9;hp=e405bb353b1f65f2963f176354a1e68dc685b406;hpb=27e5ca03d936794fba94a521de8cf93148a7cb31;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 e405bb353..e8d84409d 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -3,21 +3,23 @@
 ## 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
 		Options +Indexes +FollowSymLinks
 	</Directory>