From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 25 Jan 2013 23:49:44 +0000 (+0100)
Subject: use director for LB
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d00ed636079272459760564df20b4eb336969708;p=mirror%2Fdsa-puppet.git

use director for LB
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/varnish/files/default.vcl b/modules/varnish/files/default.vcl
index 6e87911ad..10b51d9ff 100644
--- a/modules/varnish/files/default.vcl
+++ b/modules/varnish/files/default.vcl
@@ -3,6 +3,18 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+
+director packages_debian_org {
+	{
+		.backend = holter
+		.weight = 10000;
+	}
+	{
+		.backend = powell
+		.weight = 1;
+	}
+}
+
 backend holter {
         # holter.debian.org
         .host = "194.177.211.202";
@@ -20,17 +32,7 @@ sub vcl_recv {
         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;
 
 	return(lookup);
 }