X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Froles%2Ftemplates%2Fsecurity_mirror%2Fsecurity.debian.org.erb;h=80b6ee68ffabc2439395dcd07e02065fa770dd92;hb=87c04f0b5a0dd21c9428448438ff55f988d74e42;hp=64f385134adfac91fcf1b6d0a93a12d82cbe44b3;hpb=42a11e1204c855d20fcc0dd11a142452538b2ebc;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 64f385134..80b6ee68f 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -3,19 +3,9 @@
## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
-
- IndexOptions NameWidth=* +SuppressDescription
- Options +FollowSymLinks
- Options +Indexes
- FileETag MTime Size
- <% if @lsbmajdistrelease > '7' -%>
- Require all granted
- <% end -%>
-
-
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
@@ -27,33 +17,40 @@
ServerAlias security-cdn1.debian.org
ServerAlias security-cdn2.debian.org
ServerAlias security-nagios.debian.org
+ <% if scope.function_onion_global_service_hostname(['security.debian.org']) -%>
+ ServerAlias <%= scope.function_onion_global_service_hostname(['security.debian.org']) %>
+ <% end %>
+ ServerAlias security.backend.mirrors.debian.org
+ ServerAlias *.security.backend.mirrors.debian.org
+ ServerAlias security.anycast-test.mirrors.debian.org
+
ExpiresActive On
ExpiresDefault "access plus 2 minutes"
- Alias /debian-security /srv/ftp.root/debian-security
-
-
-
- ExpiresDefault "access plus 1 month"
- Header append Cache-Control "public"
-
-
+ Alias /debian-security /srv/mirrors/debian-security
+ Use ftp-archive /srv/mirrors/debian-security
-
- ExpiresDefault "access plus 1 seconds"
- Header append Cache-Control "public"
+ Alias /_health /run/dsa-mirror-health-security/health
+
+ Require all granted
RewriteEngine on
- RewriteRule ^/$ http://www.debian.org/security/
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/security.debian.org-access.log privacy
+ RewriteRule ^/$ https://www.debian.org/security/
+
+ 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"
+ <% 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 combined
ServerSignature On
-# vim: set ts=3 sw=3 et:
+# vim:set syn=apache: