From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cPl6D0qMjz2xWj for ; Sun, 14 Sep 2025 10:39:48 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cPl6D0ZlBz2xMw for ; Sun, 14 Sep 2025 10:39:48 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cPl6C1q3Qz3Ws for ; Sun, 14 Sep 2025 10:39:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1757846387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=VYiayq1iRurjl6L/6RTg2NXc1AANWGbKgcnjKsLN2o4=; b=UmCRWS6RViETD/lVKcVNU3Rzm2rJPW5kInLnlgVn7sJP1pOKZ+4MK60fZq/oN5b91u13/h SEWHDvHzR9FdPmCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1757846387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=VYiayq1iRurjl6L/6RTg2NXc1AANWGbKgcnjKsLN2o4=; b=EHJfH80ULxRaQeaHcNbMnM2WN1lW3BAVH/2NFnTpQnLn36jiEHmRKNSmxB7ByRRB7wLXsW tx2O8DwwcjqCEYHHv8HkMRqRyty780GzIiqwjLKhy471LFgOI1He+c+MORKpXGWH96Imd/ 9vA3o3HGcufsMqXERKn6cVP9tmBKDKOyFgcEoBnU5JVKA10sibfXZQhQWU71tfOaLSPyMn xX4GmEHrvYZr/BkWJaT+uESu3X2W72YOcVUcnAUzN2DLTYK5ffia+r83h6cH/dpqAd2q9d +nUll3AZswsvMHa0ryZdI/LaUp6ke2yVsnvx9Gedhz+C7IRY5GQ2UFfNrVz9FA== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4cPl6C0TR4z2xcB; Sun, 14 Sep 2025 10:39:47 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0088442c56e8a623c25d1a93940eabd29e4d430b X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 54944268e729c8939a49a3e9536f5ad85ce9c2b8 X-Git-Newrev: 0088442c56e8a623c25d1a93940eabd29e4d430b Message-Id: <4cPl6C0TR4z2xcB@people01.haj.ipfire.org> Date: Sun, 14 Sep 2025 10:39:46 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 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 Signed-off-by: Michael Tremer commit 211d81f8e20ab9c41b99933239f402e0afafcc0d Author: Adolf Belka 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 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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