X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-debug.mirrors.debian.org.erb;h=194162620d87038ddbecce0418beaf3490838991;hb=d0c4a3cffb9addbd57bb764ed917cb06e2f84e57;hp=6f913b1e43b83c5cd69c9b2dcb6eb229b3a6a888;hpb=5ca50c9b083d9725ceb2b68ddfd6e4bfa3f75c4a;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 6f913b1e4..194162620 100644
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -3,20 +3,29 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<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 %>
+<VirtualHost <%= @vhost_listen %> 127.0.0.1:80 [::1]:80 >
+	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
+	RedirectMatch "^/$" /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
-        LogLevel warn
-        CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy
+	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: