X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsecurity_mirror%2Fsecurity.debian.org.erb;h=130dca98104804535933926d85d949634fe987b9;hb=0578c547ab8910fbec58d3c9ac68780d3df316b8;hp=5299f36aa6b409417365d8ab8c2ea03b59cbacd3;hpb=28d845a146f1b7259134059db896e8ff8bcc32d1;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 5299f36aa..130dca981 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -3,13 +3,6 @@
## 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
-
-
ServerAdmin debian-admin@debian.org
DocumentRoot /srv/ftp.root/debian-security
@@ -24,33 +17,35 @@
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 %>
+
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"
-
-
-
-
- ExpiresDefault "access plus 1 seconds"
- Header append Cache-Control "public"
-
+ Use ftp-archive /srv/ftp.root/debian-security
RewriteEngine on
RewriteRule ^/$ http://www.debian.org/security/
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
+ #RewriteCond %{HTTP:Fastly-Client-IP} !. [NV]
+ #RewriteCond %{HTTP_USER_AGENT} "!Amazon CloudFront"
+ #<% 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"
+ #<% 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]
CustomLog /var/log/apache2/security.debian.org-access.log privacy
ServerSignature On
-# vim: set ts=3 sw=3 et:
+# vim:set syn=apache: