X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-archive.debian.org.erb;h=0cf3b0c4e69bcb67e8093b443d19ffaa37e495b9;hb=873800639f512b928cf1a07a69898f5f66fbfb83;hp=8762ab58ade21139f9c6abaa3bfed31af4f242d4;hpb=5206e744c55b4175e096c8d3ffdace18ad42b7a8;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 8762ab58a..0cf3b0c4e 100644
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -3,22 +3,33 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<%
+  if not @binds.kind_of?(Array)
+    raise Puppet::Error, "binds variable is not an array"
+  end
+
+  vhost_listen = @binds.map{|x| x+":80" }.join(' ')
+%>
+
+
 <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
 
-	<Directory <%= archive_root %>>
+	<Directory <%= @archive_root %>>
 		Require all granted
-		IndexOptions NameWidth=* +SuppressDescription
 		Options +Indexes +FollowSymLinks
 	</Directory>