X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-debug.mirrors.debian.org.erb;h=1ac6c65b8ddbe3b9b2eb3b91684ae684811c622c;hb=e223cc6541f3d038e37352a0fac74010bd7ca624;hp=41431f2a7c2d622afdafc8f86864bee33adaba7e;hpb=8d3ad68faaf8d0b4e555055b8eb22b42a930c0b1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
index 41431f2a7..1ac6c65b8 100644
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -3,19 +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 debug.mirrors.debian.org
 	<% if scope.function_onion_global_service_hostname(['debug.mirrors.debian.org']) -%>
 	ServerAlias <%= scope.function_onion_global_service_hostname(['debug.mirrors.debian.org']) %>
 	<% end %>
+	ServerAlias debug.backend.mirrors.debian.org
+	ServerAlias *.debug.backend.mirrors.debian.org
 
 	RedirectMatch "^/$" /debian-debug/
-	Alias /debian-debug /srv/mirrors/debian-debug
+	Alias /debian-debug <%= @archive_root %>
+	Alias /_health /run/dsa-mirror-health-debug/health
+	<Directory /run/dsa-mirror-health-debug/>
+		Require all granted
+	</Directory>
 
 	ErrorLog /var/log/apache2/debug.mirrors.debian.org-error.log
 	CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy
 
-	Use ftp-archive /srv/mirrors/debian-debug
+	Use ftp-archive <%= @archive_root %>
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </VirtualHost>
 # vim:set syn=apache: