From 3924ac2577388c650d83eb7b970b64765e4c798e Mon Sep 17 00:00:00 2001 From: jjh Date: Oct 12 2009 03:14:40 +0000 Subject: update to 1.3.20 --- diff --git a/.cvsignore b/.cvsignore index bb43113..bf5da5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ haproxy-1.3.19.tar.gz +haproxy-1.3.20.tar.gz diff --git a/haproxy.cfg b/haproxy.cfg index 08a2839..c3f1777 100644 --- a/haproxy.cfg +++ b/haproxy.cfg @@ -1,79 +1,67 @@ -# this config needs haproxy-1.1.28 or haproxy-1.2.1 +#--------------------------------------------------------------------- +# Example configuration for a possible web application. See the +# full configuration options online. +# +# http://haproxy.1wt.eu/download/1.3/doc/configuration.txt +# +# or locally in /usr/share/doc/haproxy-1.3.20/ +# +#--------------------------------------------------------------------- +#--------------------------------------------------------------------- +# Global settings +#--------------------------------------------------------------------- global - log 127.0.0.1 local0 - log 127.0.0.1 local1 notice - #log loghost local0 info - maxconn 4096 - chroot /var/lib/haproxy - user haproxy - group haproxy - daemon - #debug - #quiet + log 127.0.0.1 local2 + chroot /var/lib/haproxy + pidfile /var/run/haproxy.pid + maxconn 4000 + user haproxy + group haproxy + daemon +#--------------------------------------------------------------------- +# common defaults that all the 'listen' and 'backend' sections will +# use if not designated in their block +#--------------------------------------------------------------------- defaults - log global - mode http - option httplog - option dontlognull - retries 3 - redispatch - maxconn 2000 - contimeout 5000 - clitimeout 50000 - srvtimeout 50000 + mode http + log global + option dontlognull + option httpclose + option httplog + option forwardfor + option redispatch + timeout connect 10000 # default 10 second time out if a backend is not found + timeout client 300000 + timeout server 300000 + maxconn 60000 + retries 3 -listen appli1-rewrite 0.0.0.0:10001 - cookie SERVERID rewrite - balance roundrobin - server app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5 - server app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5 - server app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5 - server app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5 +#--------------------------------------------------------------------- +# main frontend which proxys to the backends +#--------------------------------------------------------------------- +frontend main *:5000 + acl url_static path_beg -i /static /images /javascript /stylesheets + acl url_static path_end -i .jpg .gif .png .css .js + + use_backend static if url_static + default_backend app + +#--------------------------------------------------------------------- +# static backend for serving up images, stylesheets and such +#--------------------------------------------------------------------- +backend static + balance roundrobin + server static 127.0.0.1:4331 check -listen appli2-insert 0.0.0.0:10002 - option httpchk - balance roundrobin - cookie SERVERID insert indirect nocache - server inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3 - server inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3 - capture cookie vgnvisitor= len 32 - - option httpclose # disable keep-alive - rspidel ^Set-cookie:\ IP= # do not let this cookie tell our internal IP address - -listen appli3-relais 0.0.0.0:10003 - dispatch 192.168.135.17:80 - -listen appli4-backup 0.0.0.0:10004 - option httpchk /index.html - option persist - balance roundrobin - server inst1 192.168.114.56:80 check inter 2000 fall 3 - server inst2 192.168.114.56:81 check inter 2000 fall 3 backup - -listen ssl-relay 0.0.0.0:8443 - option ssl-hello-chk - balance source - server inst1 192.168.110.56:443 check inter 2000 fall 3 - server inst2 192.168.110.57:443 check inter 2000 fall 3 - server back1 192.168.120.58:443 backup - -listen appli5-backup 0.0.0.0:10005 - option httpchk * - balance roundrobin - cookie SERVERID insert indirect nocache - server inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3 - server inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3 - server inst3 192.168.114.57:80 backup check inter 2000 fall 3 - capture cookie ASPSESSION len 32 - srvtimeout 20000 - - option httpclose # disable keep-alive - option checkcache # block response if set-cookie & cacheable - - rspidel ^Set-cookie:\ IP= # do not let this cookie tell our internal IP address - - errorloc 502 http://192.168.114.58/error502.html +#--------------------------------------------------------------------- +# round robin balancing between the various backends +#--------------------------------------------------------------------- +backend app + balance roundrobin + server app1 127.0.0.1:5001 check + server app2 127.0.0.1:5002 check + server app3 127.0.0.1:5003 check + server app4 127.0.0.1:5004 check diff --git a/haproxy.spec b/haproxy.spec index 9752734..b4b7d86 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -5,7 +5,7 @@ %define haproxy_datadir %{_datadir}/haproxy Name: haproxy -Version: 1.3.19 +Version: 1.3.20 Release: 1%{?dist} Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments @@ -127,7 +127,10 @@ fi %changelog -* Sun Aug 02 2009 Jeremy Hinegardner - 1.3.19-1 +* Sun Oct 11 2009 Jeremy Hinegardner - 1.3.20-1 +- update to 1.3.20 + +* Sun Aug 02 2009 Jeremy Hinegardner - 1.3.19-1 - update to 1.3.19 * Fri Jul 24 2009 Fedora Release Engineering - 1.3.18-2 diff --git a/sources b/sources index 15af440..2a72137 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 24d9a068d582758a388f538ae0b307d6 haproxy-1.3.19.tar.gz +e37046e0cb2f407d92c41d7731d1dd10 haproxy-1.3.20.tar.gz