X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvarnish%2Ffiles%2Fdefault.vcl;h=709801b2cf4a1e24700606014cfa688e84544fb4;hb=43939a76d75549c7e0ed0432250f47a4a4ddb108;hp=66ff13aa1f5f307c518fa2d2f7d85e77b5aa08e0;hpb=7e4f6aa823f850e0deb757b813227bc5b81b88c9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/varnish/files/default.vcl b/modules/varnish/files/default.vcl
index 66ff13aa1..709801b2c 100644
--- a/modules/varnish/files/default.vcl
+++ b/modules/varnish/files/default.vcl
@@ -2,72 +2,26 @@
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
+vcl 4.0;
 
-backend holter {
-        # holter.debian.org
-        .host = "194.177.211.202";
-        .port = "80";
-}
-backend powell {
-        # powell.debian.org
-        .host = "87.106.64.223";
-        .port = "80";
-}
-
-sub vcl_recv {
-
-        # Add a unique header containing the client address
-        remove req.http.X-Forwarded-For;
-        set    req.http.X-Forwarded-For = req.http.rlnclientipaddr;
-
-        ### restart logic, this will redefine the backends if vcl_restart has been triggered
-        if (req.restarts == 0) {
-                set req.backend = holter;
-        } else if (req.restarts == 1) {
-                set req.backend = powell;
-        } else if (req.restarts == 2) {
-                set req.backend = holter;
-        } else {
-                set req.backend = holter;
-        }
-
-
-        if (req.request == "GET" && req.url ~ "^/search?") {
-                return(pass);
-        }
-        if (req.request == "GET" && req.url ~ "^/(squeeze|wheezy|sid|experimental|stable|testing|unstable|rc-buggy|squeezy-backports|lenny-backports|Pics)/") {
-                return(lookup);
-        }
+backend default {
+	.host = "127.0.0.1";
+	.port = "80";
 }
 
-sub vcl_fetch {
-        if (beresp.status != 200 && beresp.status != 403 && beresp.status != 404 && beresp.status != 301 && beresp.status != 302) {
+sub vcl_backend_response {
+/*        if (beresp.status != 200 && beresp.status != 403 && beresp.status != 404 && beresp.status != 301 && beresp.status != 302) {
                 return(restart);
-        }
+        }*/
 
-        # if i cant connect to the backend, ill set the grace period to be 600 seconds to hold onto content
+        # if I cant connect to the backend, ill set the grace period to be 600 seconds to hold onto content
         set beresp.ttl = 600s;
         set beresp.grace = 600s;
 
-        if (beresp.status == 404) {
-                set beresp.ttl = 0s;
-        }
-
         if (beresp.status >= 500) {
-                set beresp.ttl = 0s;
-        }
-
-        if (req.request == "GET" && req.url ~ "^/search?") {
-                set beresp.ttl = 0s;
+                set beresp.ttl = 0.1s;
         }
-
-        if (req.request == "GET" && req.url ~ "^/(squeeze|wheezy|sid|experimental|stable|testing|unstable|rc-buggy|squeezy-backports|lenny-backports|Pics)/") {
-                set beresp.ttl = 3600s;
-        }
-
-
-        set beresp.http.X-Cacheable = "YES";
-        return(deliver);
+        unset beresp.http.Set-Cookie;
 }