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=b5e3d5c524d285965f1dee322889dadc66a068b7;hp=007b5d4d682a94813e93d4f49865f44b765082f3;hpb=ce159c3c166c75b310c4a4c31d1c5b774b043f7a;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 007b5d4d6..9a9b190c5 100644
--- a/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb
+++ b/modules/roles/templates/snapshot/snapshot.debian.org.conf.erb
@@ -1,10 +1,10 @@
# vim: set ts=2 sw=2 et si sm:
-WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes=4 threads=10 maximum-requests=5000 inactivity-timeout=1800 umask=0077 display-name=wsgi-snapshot.debian.org
+WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes=4 threads=9 maximum-requests=5000 inactivity-timeout=1800 umask=0077 display-name=wsgi-snapshot.debian.org
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]
-
Require all granted
@@ -40,8 +37,30 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
+ AliasMatch "^/file/([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{36})$" "/srv/snapshot.debian.org/farm/$1/$2/$1$2$3"
+
+ Require all granted
+ #ExpiresActive on
+ #ExpiresDefault "access plus 1 year"
+ Header set Cache-Control "max-age=31536000, public"
+
+
WSGIScriptAlias / /srv/snapshot.debian.org/bin/snapshot.wsgi
WSGIProcessGroup snapshot.debian.org
+
+
+ QS_LocRequestLimitDefault 30
+
+
+
+
+ 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]