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 4cB8f41dLnz2xSN for ; Tue, 26 Aug 2025 14:08:44 +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 "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cB8f41Wfcz2xQT for ; Tue, 26 Aug 2025 14:08:44 +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 "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cB8f35bQBz26 for ; Tue, 26 Aug 2025 14:08:43 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1756217323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=WD05O6OEwJFg+Vc3Sywyja+akh3cieptBafuMFAh+Mo=; b=740dYlCEp9X5gnsdDrkwzz9wNSYFHaChVWYTQK6kSbzjzsoHaz/FFxIu83hs6XjZZQd2bV M3BvUjAqxdSPzoCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1756217323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=WD05O6OEwJFg+Vc3Sywyja+akh3cieptBafuMFAh+Mo=; b=N2n5Y4FEzRvi4noYUCsp/mKRPQXjpBsaFyx9BgDjg7xccP44ltsprb9L6bs+ddFDQUW4Ze Vr8sjSWKAnJKbxBUflP2pL6lZb5llDIJRPiLg67Fq80LfzSQAXkAoH8wBVbegCG5TUXnpJ SkO+Ckzet4o6AlCSfGJYE4Xv1ukJAnp5MRMbxwBXA+xw9hVuBVJCV3XkxllR2aaycFAXyu im1cq8hx/TR+TQCn7t6XEx9SNHg56U085mD0r+xGw1WuubtcnZ00mngW+PihSIWIGIgdd+ EdT/hWMxL7LZa6Mcgr5+mrpiac17fFn7MDgWb9ASmGlBbkLsjyQT3xeCGJq+ZA== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4cB8f355hFz2y1V; Tue, 26 Aug 2025 14:08:43 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 10149ca776262592ee20e68768fb108e1500bead X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: a0bd69576464141375f89c2003c7c5962292e7fe X-Git-Newrev: 10149ca776262592ee20e68768fb108e1500bead Message-Id: <4cB8f355hFz2y1V@people01.haj.ipfire.org> Date: Tue, 26 Aug 2025 14:08:43 +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 10149ca776262592ee20e68768fb108e1500bead (commit) via 198025111e37a80944dbab9ddd57967945e27949 (commit) via 7245ddf773b78be5fd0675d2e260b3da7855ac2c (commit) from a0bd69576464141375f89c2003c7c5962292e7fe (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 10149ca776262592ee20e68768fb108e1500bead Merge: a0bd69576 198025111 Author: Michael Tremer Date: Tue Aug 26 14:08:32 2025 +0000 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/backup/backup.pl | 5 +++++ config/rootfiles/oldcore/197/update.sh | 4 ++++ 2 files changed, 9 insertions(+) Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index e79f510c6..42d24aa3c 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -350,6 +350,11 @@ restore_backup() { fi # Update the OpenVPN configuration and restart the openvpn daemons + if grep -q "ncp-disable" /var/ipfire/ovpn/server.conf; then + sed -r -e "/ncp-disable/d" -i /var/ipfire/ovpn/server.conf + echo "DATACIPHERS=AES-256-GCM|AES-128-GCM|CHACHA20-POLY1305" >> \ + /var/ipfire/ovpn/settings + fi sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi /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..f1800b2c0 100644 --- a/config/rootfiles/oldcore/197/update.sh +++ b/config/rootfiles/oldcore/197/update.sh @@ -123,6 +123,10 @@ ldconfig /usr/local/bin/filesystem-cleanup # Update the OpenVPN configuration +if grep -q "ncp-disable" /var/ipfire/ovpn/server.conf; then + sed -r -e "/ncp-disable/d" -i /var/ipfire/ovpn/server.conf + echo "DATACIPHERS=AES-256-GCM|AES-128-GCM|CHACHA20-POLY1305" >> /var/ipfire/ovpn/settings +fi sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi # Apply SSH configuration hooks/post-receive -- IPFire 2.x development tree