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

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 42d24aa3c460f8878c3a7c985c1f8693834e4669..e79f510c67bb43e2f580d600cf5c4bf91d118063 100644 (file)
--- 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