]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
core145: Remove double-added configuration lines for OpenVPN core145
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 4 Jun 2020 14:32:22 +0000 (14:32 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 4 Jun 2020 15:13:33 +0000 (15:13 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
config/rootfiles/core/145/update.sh

index 38653b7306b01d7e49dcb41b9643abbf0443ee0b..4b59a03dc7f684bc97d9a82b21a4a52aed1b4de8 100644 (file)
@@ -78,7 +78,10 @@ for package in perl-DBI perl-DBD-SQLite; do
 done
 
 # Enable OpenVPN metrics collection
-grep -q "^client-connect" /var/ipfire/ovpn/server.conf || cat <<EOF >> /var/ipfire/ovpn/server.conf
+sed -E -i /var/ipfire/ovpn/server.conf \
+       -e "/^client-(dis)?connect/d"
+
+cat <<EOF >> /var/ipfire/ovpn/server.conf
 # Log clients connecting/disconnecting
 client-connect "/usr/sbin/openvpn-metrics client-connect"
 client-disconnect "/usr/sbin/openvpn-metrics client-disconnect"