[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0088442c56e8a623c25d1a93940eabd29e4d430b

[Michael Tremer <git@ipfire.org>]

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, master has been updated
       via  0088442c56e8a623c25d1a93940eabd29e4d430b (commit)
       via  211d81f8e20ab9c41b99933239f402e0afafcc0d (commit)
      from  54944268e729c8939a49a3e9536f5ad85ce9c2b8 (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 0088442c56e8a623c25d1a93940eabd29e4d430b
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Mon Sep 8 14:59:38 2025 +0200

    backup.pl: Update the RW entry in collectd.vpn if restoring old backup
    
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 211d81f8e20ab9c41b99933239f402e0afafcc0d
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Mon Sep 8 14:59:37 2025 +0200

    update.sh: Update collectd.vpn to the new RW log file name
    
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/backup/backup.pl             | 6 +++++-
 config/rootfiles/core/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/core/197/update.sh b/config/rootfiles/core/197/update.sh
index 0fd5cc6f0..0c5e226eb 100644
--- a/config/rootfiles/core/197/update.sh
+++ b/config/rootfiles/core/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