X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsecurity_mirror%2Fsecurity.debian.org.erb;h=ec73f2cae71e4cabb9584cceecc297f340285700;hb=9b60934e7a658e3485fd9ce057c4252796e537c9;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..ec73f2cae 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -31,10 +31,14 @@
    Alias /debian-security /srv/ftp.root/debian-security
    Use ftp-archive /srv/ftp.root/debian-security
 
+   Alias /_health /run/dsa-mirror-health-ftp/health
+   <Directory /run/dsa-mirror-health-ftp/>
+      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"
    <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
@@ -47,7 +51,6 @@
    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