[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d0d9a5d17f6f050958bf4f69b173fc24c476c5ba

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d0d9a5d17f6f050958bf4f69b173fc24c476c5ba

[Michael Tremer]

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  d0d9a5d17f6f050958bf4f69b173fc24c476c5ba (commit)
       via  0088442c56e8a623c25d1a93940eabd29e4d430b (commit)
       via  211d81f8e20ab9c41b99933239f402e0afafcc0d (commit)
      from  f0a4f19ca13c6faaa4f446eb085e801473eb5d88 (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 d0d9a5d17f6f050958bf4f69b173fc24c476c5ba
Merge: f0a4f19ca 0088442c5
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Sun Sep 14 10:39:50 2025 +0000

    Merge branch 'master' into next

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

Summary of changes:
 config/backup/backup.pl                | 6 +++++-
 config/rootfiles/oldcore/197/update.sh | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index e79f510c6..8988427ea 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -349,8 +349,12 @@ restore_backup() {
 		rm /var/log/pakfire.log
 	fi
 
-	# Update the OpenVPN configuration and restart the openvpn daemons
+	# Update the OpenVPN configuration, update the RW log entry in collectd.vpn
+	# if it is the old name and restart the openvpn daemons
 	sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi
+	if grep -q "/var/run/ovpnserver.log" /var/ipfire/ovpn/collectd.vpn; then
+		sed -i 's|"/var/run/ovpnserver.log"|"/var/run/openvpn-rw.log"|' /var/ipfire/ovpn/collectd.vpn
+	fi
 	/etc/init.d/openvpn-n2n restart
 	/etc/init.d/openvpn-rw restart
 
diff --git a/config/rootfiles/oldcore/197/update.sh b/config/rootfiles/oldcore/197/update.sh
index 0fd5cc6f0..0c5e226eb 100644
--- a/config/rootfiles/oldcore/197/update.sh
+++ b/config/rootfiles/oldcore/197/update.sh
@@ -125,6 +125,11 @@ ldconfig
 # Update the OpenVPN configuration
 sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi
 
+# Replace the OpenVPN RW log name in collectd.vpn
+if grep -q "/var/run/ovpnserver.log" /var/ipfire/ovpn/collectd.vpn; then
+	sed -i 's|"/var/run/ovpnserver.log"|"/var/run/openvpn-rw.log"|' /var/ipfire/ovpn/collectd.vpn
+fi
+
 # Apply SSH configuration
 /usr/local/bin/sshctrl
 


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