From 0b3ecf3942dfc4d512b7abc1f06535d89735a055 Mon Sep 17 00:00:00 2001 From: James Page Date: Mon, 18 Mar 2013 15:03:40 +0000 Subject: [PATCH] Fixup haproxy template --- templates/haproxy.cfg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/haproxy.cfg b/templates/haproxy.cfg index 4012b563..7404000f 100644 --- a/templates/haproxy.cfg +++ b/templates/haproxy.cfg @@ -1,7 +1,7 @@ global log 127.0.0.1 local0 log 127.0.0.1 local1 notice - maxconn 4096 + maxconn 20000 user haproxy group haproxy spread-checks 0 @@ -14,8 +14,8 @@ defaults retries 3 timeout queue 1000 timeout connect 1000 - timeout client 10000 - timeout server 10000 + timeout client 30000 + timeout server 30000 listen stats :8888 mode http @@ -25,11 +25,11 @@ listen stats :8888 stats uri / stats auth admin:password -{% for service, port in service_ports.iteritems() -%} -listen {{ service }} 0.0.0.0:{{ port }} +{% for service, ports in service_ports.iteritems() -%} +listen {{ service }} 0.0.0.0:{{ ports[0] }} balance roundrobin option tcplog {% for unit, address in units.iteritems() -%} - server {{ unit }} {{ address }}:{{ port - 1 }} check + server {{ unit }} {{ address }}:{{ ports[1] }} check {% endfor %} {% endfor %}