Merge branch 'master' of git+ssh://git2.debian.org/dsa/dsa-puppet

[mirror/dsa-puppet.git] / modules / roles / templates / security_mirror / security.debian.org.erb

diff --git a/modules/roles/templates/security_mirror/security.debian.org.erb b/modules/roles/templates/security_mirror/security.debian.org.erb
index 1638420..bd1e40c 100644 (file)
--- 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-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"
    <% 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