From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. bc18b7aabb1fc050cba2238aaef0b7ea78da6752
Date: Wed, 22 Apr 2020 10:17:23 +0000 [thread overview]
Message-ID: <496bw36Nrfz2yCG@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3131 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via bc18b7aabb1fc050cba2238aaef0b7ea78da6752 (commit)
via 651fa25f8f4764c1280b9355ed0b410825321615 (commit)
via f6a92fd85614fc03a07d21406a08505092b27a83 (commit)
via b5fe45bbbc7d2babe0b66689abaffb9ad24ccc93 (commit)
from 1bba20a985ec2dc29322e7f2cc0d820ae9a25758 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bc18b7aabb1fc050cba2238aaef0b7ea78da6752
Merge: 1bba20a98 651fa25f8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 22 10:17:05 2020 +0000
Merge remote-tracking branch 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes:
config/haproxy/haproxy.cfg | 3 ++-
config/rootfiles/oldcore/143/update.sh | 2 ++
lfs/haproxy | 6 +++---
3 files changed, 7 insertions(+), 4 deletions(-)
Difference in files:
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
diff --git a/config/rootfiles/oldcore/143/update.sh b/config/rootfiles/oldcore/143/update.sh
index 8ae8e2c5b..41d1d63b3 100644
--- 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 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)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2020-04-22 10:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=496bw36Nrfz2yCG@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox