Revert "update.sh: Adds code to update an existing ovpnconfig with pass or no-pass"

This reverts commit 9cac1034bcfe423c4a5e0f547664fbabcf9050e6.

https://lists.ipfire.org/pipermail/development/2023-May/015952.html

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

diff --git a/config/rootfiles/core/175/update.sh b/config/rootfiles/core/175/update.sh
index 83303a1c3d4200f5a0fcbade1b683661353cf175..5e45c819f865de10c53d6bbc91d1c006b334f82a 100644 (file)
--- a/config/rootfiles/core/175/update.sh
+++ b/config/rootfiles/core/175/update.sh
@@ -177,30 +177,6 @@ if [ -e /boot/pakfire-kernel-update ]; then
     /boot/pakfire-kernel-update ${KVER}
 fi
 
-## Modify ovpnconfig according to bug 11048 for pass, no-pass modification in ovpnconfig index
-# Check if ovpnconfig exists and is not empty
-if [ -s /var/ipfire/ovpn/ovpnconfig ]; then
-       # Make all N2N connections 'no-pass' since they do not use encryption
-       awk '{FS=OFS=","} {if($5=="net") {$43="no-pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new
-
-       # Evaluate roadwarrior connection names for *.p12 files
-       for y in $(awk -F',' '/host/ { print $3 }' /var/ipfire/ovpn/ovpnconfig); do
-           # Sort all unencrypted roadwarriors out and set 'no-pass' in [43] index
-               if [[ -n $(openssl pkcs12 -info -in /var/ipfire/ovpn/certs/${y}.p12 -noout -password pass:'' 2>&1 | grep 'Encrypted') ]]; then
-                       awk -v var="$y" '{FS=OFS=","} {if($3==var) {$43="no-pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new
-               fi
-           # Sort all encrypted roadwarriors out and set 'pass' in [43] index
-               if [[ -n $(openssl pkcs12 -info -in /var/ipfire/ovpn/certs/${y}.p12 -noout -password pass:'' 2>&1 | grep 'error')  ]]; then
-                       awk -v var="$y" '{FS=OFS=","} {if($3==var) {$43="pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new
-               fi
-       done
-fi
-
-# Replace existing ovpnconfig with updated index
-mv /var/ipfire/ovpn/ovpnconfig.new /var/ipfire/ovpn/ovpnconfig
-# Set correct ownership
-chown nobody:nobody /var/ipfire/ovpn/ovpnconfig
-
 # This update needs a reboot...
 touch /var/run/need_reboot