Merge remote-tracking branch 'origin/master' into next

diff --git a/config/haproxy/haproxy.cfg b/config/haproxy/haproxy.cfg
index 9d372f63fbccff96c01afccf4f90613279ec0e7c..32dff328f97f72732078935d533e589e7529b8c0 100644 (file)
--- a/config/haproxy/haproxy.cfg
+++ b/config/haproxy/haproxy.cfg
@@ -60,7 +60,8 @@ defaults
 #---------------------------------------------------------------------
 # main frontend which proxys to the backends
 #---------------------------------------------------------------------
-frontend  main *:5000
+frontend  main
+    bind *:5000
     acl url_static       path_beg       -i /static /images /javascript /stylesheets
     acl url_static       path_end       -i .jpg .gif .png .css .js
 

diff --git a/config/rootfiles/oldcore/143/update.sh b/config/rootfiles/oldcore/143/update.sh
index 8ae8e2c5b39044c8288def627a9203e2733f4e69..41d1d63b3d99818ce701ac8c193b37e374bbcc8c 100644 (file)
--- a/config/rootfiles/oldcore/143/update.sh
+++ b/config/rootfiles/oldcore/143/update.sh
@@ -61,7 +61,9 @@ extract_files
 ldconfig
 
 # remove wrong vnstat tag file
+/etc/init.d/vnstat stop
 rm -f /var/log/vnstat/tag
+/etc/init.d/vnstat start
 
 # set /var/spool/cron to cron user
 chown cron:cron /var/spool/cron

diff --git a/lfs/haproxy b/lfs/haproxy
index d326a090a6c5394c32ae1d3daf61b9a08ca02161..62a1c4d10acf4de7c9a2e66dfc4ea953b9eea850 100644 (file)
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.3
+VER        = 2.1.4
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 13
+PAK_VER    = 14
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bea4726d8c99f5d9bac0e62906a1f2d0
+$(DL_FILE)_MD5 = 100cccf98aaf3ba80b5fd070866ad115
 
 install : $(TARGET)