From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bn7TX1zG0z2ywH for ; Wed, 23 Jul 2025 09:03:28 +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 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4bn7TX1krGz2xQW for ; Wed, 23 Jul 2025 09:03:28 +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 "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4bn7TW51BXz1Fd for ; Wed, 23 Jul 2025 09:03:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1753261407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=q29SR1r6NPfhP6cZ4++0nQ2PTyllA5dKVCExSTd3/qk=; b=ruzjPL7MtVzzLejYWQGPcFyTF1I/nIXpikFF5X8ZnuHKZj7NSg8GSD8b4xCMsQRdLfApln MCkmQXHF6mmvpcCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1753261407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=q29SR1r6NPfhP6cZ4++0nQ2PTyllA5dKVCExSTd3/qk=; b=uFzVka84WcFKrCr85lc4KOvZVhAvJyDbl+vQS1DQbNjVw6EnIDGeyfj/WLnMrNYy6Wrde8 ialA29Rs/CGf57sBt2eUXkXFuQVShIfB+UY711UAJfQpvCwXMRvz93WX+E+jCqL8lZUxKF 4Pxy5ZvCVeclbcZEG6EgRzW3yXdiAvPU/PZbK+NEI32/Oa0mv7mETe7f3aIfWU/lanXzBd SVGxr7dYejyfeRLlp8tH4I9rFR8u9xa1yrIcLX3Jj76bcOqnHb7ln3Z0H14e2qOz5H39mQ nF/zzoMDF1NlyXdoZXI6RWTrYKgJVYCrtSSSTJKlY3hQw9pJ0mVTiWWwpRRuZw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4bn7TW2p7rz2xNC; Wed, 23 Jul 2025 09:03:27 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3eefc5fc6d98b6a117284c30c8ef0b3f67440c52 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: a9febdb8dd3547950f7581eb0ae0e619e0d2d21e X-Git-Newrev: 3eefc5fc6d98b6a117284c30c8ef0b3f67440c52 Message-Id: <4bn7TW2p7rz2xNC@people01.haj.ipfire.org> Date: Wed, 23 Jul 2025 09:03:27 +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 3eefc5fc6d98b6a117284c30c8ef0b3f67440c52 (commit) via 39172586ac8778d34392ef881dda3eca797239a4 (commit) via 81e867c96620ac5f000f68afa6b4cc36066f1a78 (commit) from a9febdb8dd3547950f7581eb0ae0e619e0d2d21e (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 3eefc5fc6d98b6a117284c30c8ef0b3f67440c52 Author: Michael Tremer Date: Wed Jul 23 09:02:25 2025 +0000 core197: Restart the firewall This is required so that all new OpenVPN chains are available. Signed-off-by: Michael Tremer commit 39172586ac8778d34392ef881dda3eca797239a4 Author: Michael Tremer Date: Wed Jul 23 09:00:09 2025 +0000 openvpn: Silence when loading the tun module goes wrong Signed-off-by: Michael Tremer commit 81e867c96620ac5f000f68afa6b4cc36066f1a78 Author: Michael Tremer Date: Wed Jul 23 08:58:43 2025 +0000 core197: Escape slashes in path in sed command I think I have been too fast... Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 2 +- config/rootfiles/core/197/update.sh | 3 ++- src/initscripts/system/openvpn-n2n | 2 +- src/initscripts/system/openvpn-rw | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index a227be841..ed7a68455 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -354,7 +354,7 @@ restore_backup() { -e "s/^writepid .*/writepid \/var\/run\/openvpn-rw.pid/" \ -e "/ncp-disable/d" \ -e "s/^cipher (.*)/data-ciphers-fallback \1/" \ - -e "s/^status .*/status /var/run/openvpn-rw.log/" \ + -e "s/^status .*/status \/var\/run\/openvpn-rw.log/" \ -i /var/ipfire/ovpn/server.conf # Change to the subnet topology diff --git a/config/rootfiles/core/197/update.sh b/config/rootfiles/core/197/update.sh index 936e692a9..63250a826 100644 --- a/config/rootfiles/core/197/update.sh +++ b/config/rootfiles/core/197/update.sh @@ -125,7 +125,7 @@ sed -r \ -e "s/^writepid .*/writepid \/var\/run\/openvpn-rw.pid/" \ -e "/ncp-disable/d" \ -e "s/^cipher (.*)/data-ciphers-fallback \1/" \ - -e "s/^status .*/status /var/run/openvpn-rw.log/" \ + -e "s/^status .*/status \/var\/run\/openvpn-rw.log/" \ -i /var/ipfire/ovpn/server.conf # Change to the subnet topology @@ -152,6 +152,7 @@ fi /usr/local/bin/sshctrl # Restart services +/etc/init.d/firewall restart /etc/init.d/unbound restart if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then /etc/init.d/ipsec start diff --git a/src/initscripts/system/openvpn-n2n b/src/initscripts/system/openvpn-n2n index 4d55f4cbd..985398379 100644 --- a/src/initscripts/system/openvpn-n2n +++ b/src/initscripts/system/openvpn-n2n @@ -252,7 +252,7 @@ start() { fi # Load the tun module - modprobe tun + modprobe tun &>/dev/null boot_mesg "Starting OpenVPN N2N connection '${name}'..." diff --git a/src/initscripts/system/openvpn-rw b/src/initscripts/system/openvpn-rw index 56a62d71c..6359d0d08 100644 --- a/src/initscripts/system/openvpn-rw +++ b/src/initscripts/system/openvpn-rw @@ -35,7 +35,7 @@ case "${1}" in fi # Load the tun module - modprobe tun + modprobe tun &>/dev/null # Flush all firewall rules iptables -F OVPNINPUTRW hooks/post-receive -- IPFire 2.x development tree