re-weight varnish LB. holter's disk are dying, so we better do 50:50 LB

[dsa-puppet.git] / modules / varnish / files / default.vcl

diff --git a/modules/varnish/files/default.vcl b/modules/varnish/files/default.vcl
index 66ff13aa1f5f307c518fa2d2f7d85e77b5aa08e0..38b75fd42d607fc7faed3f83e8eb0f78d40aca94 100644 (file)
--- a/modules/varnish/files/default.vcl
+++ b/modules/varnish/files/default.vcl
@@ -3,41 +3,34 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-backend holter {
-        # holter.debian.org
-        .host = "194.177.211.202";
-        .port = "80";
-}
-backend powell {
-        # powell.debian.org
-        .host = "87.106.64.223";
-        .port = "80";
+
+director packages_debian_org random {
+       {
+               .backend = {
+                       .host = "194.177.211.202";
+                       .port = "80";
+               }
+               .weight = 1;
+       }
+        {
+                .backend = {
+                        .host = "87.106.64.223";
+                        .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 {
@@ -49,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);
 }
@@ -83,3 +63,4 @@ sub vcl_deliver {
 
         return(deliver);
 }
+