Move kaufmann keyserver fw into keyring role

[mirror/dsa-puppet.git] / modules / roles / templates / apache-debug.mirrors.debian.org.erb

diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
index 6f913b1..1941626 100644 (file)
--- 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: