From 4963d555f601367b5da92d3a6dcdfa750a915e0b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 3 Jun 2020 14:41:12 +0000 Subject: [PATCH 1/2] core145: Update OpenVPN server configuration only when necessary Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/145/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh index 893539f30..38653b730 100644 --- a/config/rootfiles/core/145/update.sh +++ b/config/rootfiles/core/145/update.sh @@ -78,7 +78,7 @@ for package in perl-DBI perl-DBD-SQLite; do done # Enable OpenVPN metrics collection -cat <> /var/ipfire/ovpn/server.conf +grep -q "^client-connect" /var/ipfire/ovpn/server.conf || cat <> /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" From 405c7326d2b712d5b212ac4112959f1a109c720a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 4 Jun 2020 14:32:22 +0000 Subject: [PATCH 2/2] core145: Remove double-added configuration lines for OpenVPN Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/145/update.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 <> /var/ipfire/ovpn/server.conf +sed -E -i /var/ipfire/ovpn/server.conf \ + -e "/^client-(dis)?connect/d" + +cat <> /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"