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=5bdfb10702fc3322b473233f33113427e26aebf9;hp=f20d4b609e986b2f3c58e8611ca8743b67e1e99f;hpb=65139996ecd9fed4bb7498e6ac9e73fdaa6920ac;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 f20d4b609..1ac6c65b8 100644
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -3,23 +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
+<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
+	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
-
-        <Directory /srv/mirrors/debian-debug>
-                Require all granted
-                IndexOptions NameWidth=* +SuppressDescription
-                Options +Indexes
-                Options +FollowSymLinks
-        </Directory>
-</VirtualHost>
+	ErrorLog /var/log/apache2/debug.mirrors.debian.org-error.log
+	CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy
 
+	Use ftp-archive <%= @archive_root %>
 
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
+</VirtualHost>
+# vim:set syn=apache: