From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 29 Aug 2025 10:33:32 +0000 (+0100)
Subject: Revert "backup.pl: Ensure ncp-disable is removed from old backups and DATACIPHERS... 
X-Git-Tag: v2.29-core197~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5339b5bc1ada6b4148384bc7db5e5b91b519c895;p=ipfire-2.x.git

Revert "backup.pl: Ensure ncp-disable is removed from old backups and DATACIPHERS added"

This reverts commit 7245ddf773b78be5fd0675d2e260b3da7855ac2c.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 42d24aa3c..e79f510c6 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -350,11 +350,6 @@ 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