X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-debug.mirrors.debian.org.erb;h=10372473387026f63e99181f4e5f4a438b3deee1;hb=43939a76d75549c7e0ed0432250f47a4a4ddb108;hp=51c4545d462270578b3b985a4e520a366b62f28a;hpb=dd58830d6f8557e2f442905a655ca78bfe69dfe4;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 51c4545d4..103724733 100644
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -3,22 +3,25 @@
 ## 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 /srv/mirrors/debian-debug
 
-        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
 
-        <Directory /srv/mirrors/debian-debug>
-                Require all granted
-                IndexOptions NameWidth=* +SuppressDescription
-                Options +Indexes
-                Options +FollowSymLinks
-        </Directory>
-        Use ftp-archive /srv/mirrors/debian-debug
+	Use ftp-archive /srv/mirrors/debian-debug
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </VirtualHost>
+# vim:set syn=apache: