X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsnapshot%2Fsnapshot.debian.org.conf.erb;h=9a9b190c50033515ab5f4da1f8f7f337abe558d7;hb=6f0519ea008323e67f933fd1168c6c906f2c289d;hp=e3d4c316b5644dfefeed6371662989aba1cef16e;hpb=b8e81a9814ac419978878af2da3ed785b02272f9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb b/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb
index e3d4c316b..9a9b190c5 100644
--- a/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb
+++ b/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb
@@ -4,7 +4,7 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
 
 <VirtualHost *:80>
   ServerName snapshot.debian.org
-  ServerAlias snapshot-dev.debian.org snapshot-master.debian.org snapshot-*.debian.org snapshot.debian.net
+  ServerAlias snapshot-dev.debian.org snapshot-master.debian.org snapshot-*.debian.org
   ServerAdmin team@snapshot.debian.org
 
   ErrorLog  /var/log/apache2/snapshot.debian.org-error.log
@@ -25,9 +25,6 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
   RewriteRule ^/archive/backports.org/(.*) /archive/debian-backports/$1 [L,R]
   RewriteRule ^/git/(.*) /gits/snapshot.git/$1 [PT]
 
-  RewriteCond  %{HTTP_HOST} ^snapshot.debian.net$
-  RewriteRule ^/(.*)$ http://snapshot.debian.org/ [R]
-
   <Location /gits/>
     Require all granted
   </Location>
@@ -40,8 +37,30 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
     </Files>
   </Directory>
 
+  AliasMatch "^/file/([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{36})$" "/srv/snapshot.debian.org/farm/$1/$2/$1$2$3"
+  <Directory /srv/snapshot.debian.org/farm>
+    Require all granted
+    #ExpiresActive on
+    #ExpiresDefault "access plus 1 year"
+    Header set Cache-Control "max-age=31536000, public"
+  </Directory>
+
   WSGIScriptAlias / /srv/snapshot.debian.org/bin/snapshot.wsgi
   WSGIProcessGroup snapshot.debian.org
+
+  <IfModule mod_qos.c>
+    QS_LocRequestLimitDefault  30
+  </IfModule>
+</VirtualHost>
+
+<VirtualHost *:80>
+  ServerName snapshot.debian.net
+  ServerAdmin team@snapshot.debian.org
+
+  ErrorLog  /var/log/apache2/snapshot.debian.net-error.log
+  CustomLog /var/log/apache2/snapshot.debian.net-access.log combined
+
+  RewriteRule ^/(.*)$ http://snapshot.debian.org/ [R]
 </VirtualHost>
 
 <VirtualHost *:80>