From b5fe45bbbc7d2babe0b66689abaffb9ad24ccc93 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 14 Apr 2020 09:55:29 +0000 Subject: [PATCH 1/3] core143: disable vnstat ramdisk before clean tag file Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/143/update.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/143/update.sh b/config/rootfiles/core/143/update.sh index 8ae8e2c5b..41d1d63b3 100644 --- a/config/rootfiles/core/143/update.sh +++ b/config/rootfiles/core/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 From f6a92fd85614fc03a07d21406a08505092b27a83 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 14 Apr 2020 11:54:15 +0000 Subject: [PATCH 2/3] haproxy: Update to 2.1.4 This is a security release: https://www.mail-archive.com/haproxy@formilux.org/msg36876.html Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- lfs/haproxy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/haproxy b/lfs/haproxy index d326a090a..62a1c4d10 100644 --- 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) From 651fa25f8f4764c1280b9355ed0b410825321615 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 14 Apr 2020 15:30:51 +0000 Subject: [PATCH 3/3] haproxy: update config file Signed-off-by: Arne Fitzenreiter --- config/haproxy/haproxy.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/haproxy/haproxy.cfg b/config/haproxy/haproxy.cfg index 9d372f63f..32dff328f 100644 --- 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