X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsecurity_mirror%2Fsecurity.debian.org.erb;h=ce8e82a2b3ea6312749c9c46d0fa86a315f568d7;hb=901a2500474ca42f467962c570fc580336145da0;hp=1638420528a0db03041fc593fb55c0bdc4d4f2fc;hpb=04bb6dbf20fb85a8e9b0df95d9cbfdb01871a582;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index 163842052..ce8e82a2b 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -5,7 +5,7 @@
 
 <VirtualHost *:80>
    ServerAdmin debian-admin@debian.org
-   DocumentRoot /srv/ftp.root/debian-security
+   DocumentRoot /srv/mirrors/debian-security
    ServerPath /debian-security
    ServerName security.debian.org
    ServerAlias security.ipv6.debian.org
@@ -28,26 +28,31 @@
    ExpiresActive On
    ExpiresDefault "access plus 2 minutes"
 
-   Alias /debian-security /srv/ftp.root/debian-security
-   Use ftp-archive /srv/ftp.root/debian-security
+   Alias /debian-security /srv/mirrors/debian-security
+   Use ftp-archive /srv/mirrors/debian-security
+
+   Alias /_health /run/dsa-mirror-health-security/health
+   <Directory /run/dsa-mirror-health-security/>
+      Require all granted
+   </Directory>
 
    RewriteEngine on
    RewriteRule ^/$      https://www.debian.org/security/
 
-   <% if @hostname == "setoguchi" %>
    RewriteCond %{HTTP:Fastly-Client-IP} !. [NV]
    RewriteCond %{HTTP_USER_AGENT} "!Amazon CloudFront"
+   RewriteCond %{HTTP_USER_AGENT} "!check_http"
    <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
    RewriteCond %{HTTP_HOST} "!=<%= scope.function_onion_global_service_hostname(['security.debian.org']) %>"
    <% end %>
    RewriteRule ^/(pool/updates/main/l/linux/.*) http://security-cdn.debian.org/$1 [L,R=302]
    RewriteCond %{HTTP:Fastly-Client-IP} !. [NV]
    RewriteCond %{HTTP_USER_AGENT} "!Amazon CloudFront"
+   RewriteCond %{HTTP_USER_AGENT} "!check_http"
    <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
    RewriteCond %{HTTP_HOST} "!=<%= scope.function_onion_global_service_hostname(['security.debian.org']) %>"
    <% end %>
    RewriteRule ^/debian-security/(pool/updates/main/l/linux/.*) http://security-cdn.debian.org/$1 [L,R=302]
-   <% end %>
 
    CustomLog /var/log/apache2/security.debian.org-access.log privacy
    ServerSignature On