Core Updatr 172: Properly replace DH parameter in /var/ipfire/ovpn/n2nconf/*/*.conf

https://lists.ipfire.org/pipermail/development/2022-December/015001.html

Reported-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/core/172/update.sh
index 585943950c64710eae07d84a6d19878db85ff64f..dffe090d808f459d0dafbf9b372d44f1f161cc19 100644 (file)
--- a/config/rootfiles/core/172/update.sh
+++ b/config/rootfiles/core/172/update.sh
@@ -155,13 +155,7 @@ done
 chown -Rv root:root /var/ipfire/connscheduler/lib.pl /var/ipfire/updatexlrator/updxlrator-lib.pl /var/ipfire/menu.d/*
 
 # Replace existing OpenVPN Diffie-Hellman parameter by ffdhe4096, as specified in RFC 7919
-if [ -f /var/ipfire/ovpn/server.conf ]; then
-       sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/server.conf
-fi
-
-if [ -f "/var/ipfire/ovpn/n2nconf/*/*.conf" ]; then
-       sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/n2nconf/*/*.conf
-fi
+sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/server.conf /var/ipfire/ovpn/n2nconf/*/*.conf
 
 # Start services
 if grep -q "ENABLE_IDS=on" /var/ipfire/suricata/settings; then