X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvarnish%2Ffiles%2Fdefault.vcl;h=bff0524d7a122633cf64bd62c552654e9dfedf70;hb=b31ea650c9caecaf1fd2c5af6a47a0d340e22c5f;hp=cb946cfbcd074e41ca47d93a195390f9a0e6d6c4;hpb=4c5c4151615376e493908971c838fd4ed397b99a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/varnish/files/default.vcl b/modules/varnish/files/default.vcl
index cb946cfbc..bff0524d7 100644
--- a/modules/varnish/files/default.vcl
+++ b/modules/varnish/files/default.vcl
@@ -1,38 +1,36 @@
-backend holter {
-        # holter.debian.org
-        .host = "194.177.211.202";
-        .port = "80";
-}
-backend powell {
-        # powell.debian.org
-        .host = "87.106.64.223";
-        .port = "80";
+##
+## 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
+##
+
+
+director packages_debian_org random {
+	{
+		.backend = {
+			.host = "5.153.231.3";
+			.port = "80";
+		}
+		.weight = 1;
+	}
+	{
+		.backend = {
+			.host = "213.165.95.4";
+			.port = "80";
+		}
+		.weight = 1;
+	}
 }
 
+
 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;
-        }
-
+        set req.backend = packages_debian_org;
 
-        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);
-        }
+        return(lookup);
 }
 
 sub vcl_fetch {
@@ -44,23 +42,10 @@ sub vcl_fetch {
         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;
-        }
-
-        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);
 }
@@ -78,3 +63,4 @@ sub vcl_deliver {
 
         return(deliver);
 }
+