[arch-commits] Commit in haproxy/trunk (PKGBUILD haproxy.cfg)

[Johannes Löthberg]

    Date: Friday, April 22, 2016 @ 18:19:40
  Author: demize
Revision: 171590

upgpkg: haproxy 1.6.4-2

Fix example configuration

Modified:
  haproxy/trunk/PKGBUILD
  haproxy/trunk/haproxy.cfg

-------------+
 PKGBUILD    |    7 ++++---
 haproxy.cfg |   47 ++++++++++++++++++++++-------------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-22 11:28:27 UTC (rev 171589)
+++ PKGBUILD	2016-04-22 16:19:40 UTC (rev 171590)
@@ -1,9 +1,10 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 
 pkgname=haproxy
 pkgver=1.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Reliable, high performance TCP/HTTP load balancer'
 arch=('i686' 'x86_64')
 url='http://haproxy.org/'
@@ -14,7 +15,7 @@
 source=(http://haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz
         haproxy.cfg)
 md5sums=('ee107312ef58432859ee12bf048025ab'
-         '7e41518332eeae70fa30dc30861c17c8')
+         '02241a8ca257d12f7eb131e2d7da3f3b')
 
 prepare() {
   cd haproxy-$pkgver

Modified: haproxy.cfg
===================================================================
--- haproxy.cfg	2016-04-22 11:28:27 UTC (rev 171589)
+++ haproxy.cfg	2016-04-22 16:19:40 UTC (rev 171590)
@@ -1,39 +1,29 @@
 #---------------------------------------------------------------------
-# Example configuration for a possible web application.  See the
-# full configuration options online.
+# Example configuration.  See the full configuration manual online.
 #
-#   http://haproxy.1wt.eu/download/1.4/doc/configuration.txt
+#   http://www.haproxy.org/download/1.6/doc/configuration.txt
 #
 #---------------------------------------------------------------------
 
 global
-    log         127.0.0.1 local2
-
+    maxconn     20000
+    log         127.0.0.1 local0
+    user        haproxy
     chroot      /usr/share/haproxy
     pidfile     /run/haproxy.pid
-    maxconn     4000
-    user        haproxy
     daemon
 
-defaults
-    mode                    http
-    log                     global
-    option                  httplog
-    option                  dontlognull
-    option http-server-close
-    option forwardfor       except 127.0.0.0/8
-    option                  redispatch
-    retries                 3
-    timeout http-request    10s
-    timeout queue           1m
-    timeout connect         10s
-    timeout client          1m
-    timeout server          1m
-    timeout http-keep-alive 10s
-    timeout check           10s
-    maxconn                 3000
+frontend  main
+    bind :5000
+    mode                 http
+    log                  global
+    option               httplog
+    option               dontlognull
+    option               http_proxy
+    option forwardfor    except 127.0.0.0/8
+    maxconn              8000
+    timeout              client  30s
 
-frontend  main *:5000
     acl url_static       path_beg       -i /static /images /javascript /stylesheets
     acl url_static       path_end       -i .jpg .gif .png .css .js
 
@@ -41,11 +31,18 @@
     default_backend             app
 
 backend static
+    mode        http
     balance     roundrobin
+    timeout     connect 5s
+    timeout     server  5s
     server      static 127.0.0.1:4331 check
 
 backend app
+    mode        http
     balance     roundrobin
+    timeout     connect 5s
+    timeout     server  30s
+    timeout     queue   30s
     server  app1 127.0.0.1:5001 check
     server  app2 127.0.0.1:5002 check
     server  app3 127.0.0.1:5003 check