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=66c5d9c1b5978be339aa6c315751fa205206a373;hpb=4f024f48c0abbcd42de87e3ca799f9f4b7e29049;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 66c5d9c1b..130dca981 100644
--- a/modules/roles/templates/security_mirror/security.debian.org.erb
+++ b/modules/roles/templates/security_mirror/security.debian.org.erb
@@ -3,14 +3,6 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<Directory /srv/ftp.root/debian-security>
-   IndexOptions NameWidth=* +SuppressDescription
-   Options +FollowSymLinks
-   Options +Indexes
-   FileETag MTime Size
-   Require all granted
-</Directory>
-
 <VirtualHost *:80>
    ServerAdmin debian-admin@debian.org
    DocumentRoot /srv/ftp.root/debian-security
@@ -25,6 +17,10 @@
    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"
@@ -35,12 +31,21 @@
    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
 </VirtualHost>
 
-# vim: set ts=3 sw=3 et:
+# vim:set syn=apache: