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 4cPl6N38sFz2xWj for ; Sun, 14 Sep 2025 10:39:56 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (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 4cPl6N33wqz2xMw for ; Sun, 14 Sep 2025 10:39:56 +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) (Client CN "people01.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cPl6M6L11z3Ws for ; Sun, 14 Sep 2025 10:39:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1757846395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=ynlLRRxfbLBYgvZOL9NmzyZhtvvd7SsOZ4ez2HjI/Co=; b=LSxKU4IDL4KREAwIqWPxUNbY4vgGZ56e76RzXZMw6BLaV84acUfFpKoHlK07OshSUWYOqw A9yOEriAXkEqvGCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1757846395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=ynlLRRxfbLBYgvZOL9NmzyZhtvvd7SsOZ4ez2HjI/Co=; b=ndz5qY9tw+2ebyhre4bKjyKM8lMANTE65nXKpkRH8waAXgu13LN7WG3wAqQwnZR98soM17 gWcsDfhHcPQgzj+c4hhROReyjKGnwEb9ovbQkzEXrqyRGrrOTtNynVUkLtshZnfW9KIkAf aVb9HRy3PvhG1FPy6zXVbU/q1OsrFcPdiKxlNziWXXAwAwE9rfrlnXF2fNQYq09KEWWw9A WFKax+OJbOmM0H74nECdk7NzwFnlCTgFdmoXwJWrVnq4P3kah0vACAkuep+VFAeAuJh9PA wxz/9A7Qxwcl3jWhZYf+NC+On49hXdDyu9WmLkh775GL7xO1K3v6OBeyPRj0mQ== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4cPl6M5vl7z2xcB; Sun, 14 Sep 2025 10:39:55 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d0d9a5d17f6f050958bf4f69b173fc24c476c5ba X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: f0a4f19ca13c6faaa4f446eb085e801473eb5d88 X-Git-Newrev: d0d9a5d17f6f050958bf4f69b173fc24c476c5ba Message-Id: <4cPl6M5vl7z2xcB@people01.haj.ipfire.org> Date: Sun, 14 Sep 2025 10:39:55 +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, 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 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