X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-archive.debian.org.erb;h=0cf3b0c4e69bcb67e8093b443d19ffaa37e495b9;hb=09c80262c3d713f889e018c471b7a1de9fbc4407;hp=6dad6dc8f3ef3f991bbf007eb63c109d017bd4ac;hpb=e8dc3158ada8326337eab361ae00d96a5d07cc3b;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 6dad6dc8f..0cf3b0c4e 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -4,11 +4,11 @@
 ##
 
 <%
-  if not binds.kind_of?(Array)
+  if not @binds.kind_of?(Array)
     raise Puppet::Error, "binds variable is not an array"
   end
 
-  vhost_listen = binds.map{|x| x+":80" }.join(' ')
+  vhost_listen = @binds.map{|x| x+":80" }.join(' ')
 %>
 
 
@@ -18,15 +18,17 @@
 	<% 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>