core145: Remove double-added configuration lines for OpenVPN

Message ID 20200604143222.3380-1-michael.tremer@ipfire.org
State New
Headers show
Series
  • core145: Remove double-added configuration lines for OpenVPN
Related show

Commit Message

Michael Tremer June 4, 2020, 2:32 p.m. UTC
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/core/145/update.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh
index 38653b730..4b59a03dc 100644
--- a/config/rootfiles/core/145/update.sh
+++ b/config/rootfiles/core/145/update.sh
@@ -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"