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 d2e2c945a9cb7e3c5f0aa5db81ff95afdfbff81c (commit) via f2d7d4ec16f2aea87b5e8fe638b062610cd8dc94 (commit) from 4c7266a39e990db15498a7541ed7b0ad74184986 (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 d2e2c945a9cb7e3c5f0aa5db81ff95afdfbff81c Author: Peter Müller peter.mueller@ipfire.org Date: Sun Jan 14 16:05:12 2024 +0000

Core Update 183: Ship 60-collectd

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit f2d7d4ec16f2aea87b5e8fe638b062610cd8dc94 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jan 12 13:29:04 2024 +0000

collectd: Restart is required after reconnect

The "ping" plugin does not re-resolve the gateway IP address after pinging it for the first time. For most people this won't be a big problem, but if the default gateway changes, the latency graph won't work any more.

In order to do re-resolve "gateway", the only way is to restart collectd.

Fixes: #13522 Signed-off-by: Michael Tremer michael.tremer@ipfire.org Acked-by: Peter Müller peter.mueller@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/aarch64/initscripts | 1 + config/rootfiles/common/riscv64/initscripts | 1 + config/rootfiles/common/x86_64/initscripts | 1 + config/rootfiles/core/183/filelists/files | 1 + src/initscripts/networking/red.up/60-collectd | 6 ++++++ 5 files changed, 10 insertions(+) create mode 100644 src/initscripts/networking/red.up/60-collectd

Difference in files: diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index f025651c3..a988b4abc 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -62,6 +62,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns #etc/rc.d/init.d/networking/red.up/35-guardian etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn +etc/rc.d/init.d/networking/red.up/60-collectd etc/rc.d/init.d/networking/red.up/98-leds etc/rc.d/init.d/networking/red.up/99-beep etc/rc.d/init.d/networking/red.up/99-fireinfo diff --git a/config/rootfiles/common/riscv64/initscripts b/config/rootfiles/common/riscv64/initscripts index 8a4f046d3..a5e1596fb 100644 --- a/config/rootfiles/common/riscv64/initscripts +++ b/config/rootfiles/common/riscv64/initscripts @@ -62,6 +62,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns #etc/rc.d/init.d/networking/red.up/35-guardian etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn +etc/rc.d/init.d/networking/red.up/60-collectd etc/rc.d/init.d/networking/red.up/98-leds etc/rc.d/init.d/networking/red.up/99-beep etc/rc.d/init.d/networking/red.up/99-fireinfo diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 8a4f046d3..a5e1596fb 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -62,6 +62,7 @@ etc/rc.d/init.d/networking/red.up/30-ddns #etc/rc.d/init.d/networking/red.up/35-guardian etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn +etc/rc.d/init.d/networking/red.up/60-collectd etc/rc.d/init.d/networking/red.up/98-leds etc/rc.d/init.d/networking/red.up/99-beep etc/rc.d/init.d/networking/red.up/99-fireinfo diff --git a/config/rootfiles/core/183/filelists/files b/config/rootfiles/core/183/filelists/files index 949b1b2dc..d5adf79b8 100644 --- a/config/rootfiles/core/183/filelists/files +++ b/config/rootfiles/core/183/filelists/files @@ -1,3 +1,4 @@ +etc/rc.d/init.d/networking/red.up/60-collectd srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat diff --git a/src/initscripts/networking/red.up/60-collectd b/src/initscripts/networking/red.up/60-collectd new file mode 100644 index 000000000..0e457894f --- /dev/null +++ b/src/initscripts/networking/red.up/60-collectd @@ -0,0 +1,6 @@ +#!/bin/bash + +# Restart collectd because the ping plugin does not re-resolve "gateway" +exec /etc/init.d/collectd restart + +exit 1

hooks/post-receive -- IPFire 2.x development tree