X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsecurity_mirror%2Fsecurity.debian.org.erb;h=91e4056e477a3de0f17aaf8e4e351170617399c7;hb=d0c4a3cffb9addbd57bb764ed917cb06e2f84e57;hp=52e7950b92112d27a69db3ef9fa899a9f09e6116;hpb=d8b6b760a99f36fc6bf6088b8e998c1d67d46ab6;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 52e7950b9..91e4056e4 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -3,7 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost *:80>
+<VirtualHost <%= @vhost_listen %> 127.0.0.1:80 [::1]:80 >
    ServerAdmin debian-admin@debian.org
    DocumentRoot /srv/mirrors/debian-security
    ServerPath /debian-security
@@ -41,12 +41,16 @@
 
    RewriteCond %{HTTP:Fastly-Client-IP} !. [NV]
    RewriteCond %{HTTP_USER_AGENT} "!Amazon CloudFront"
+   RewriteCond %{HTTP_USER_AGENT} "!check_http"
+   RewriteCond %{HTTP_USER_AGENT} "!dsa-check-mirrorsync"
+   RewriteCond %{HTTP_USER_AGENT} "!mirror-health"
    <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
    RewriteCond %{HTTP_HOST} "!=<%= scope.function_onion_global_service_hostname(['security.debian.org']) %>"
    <% end %>
+   RewriteCond %{REQUEST_URI} "!=/_health"
    RewriteRule ^/(.*) http://security-cdn.debian.org/$1 [L,R=302]
 
-   CustomLog /var/log/apache2/security.debian.org-access.log privacy
+   CustomLog /var/log/apache2/security.debian.org-access.log combined
    ServerSignature On
 </VirtualHost>