[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 405c7326d2b712d5b212ac4112959f1a109c720a

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 405c7326d2b712d5b212ac4112959f1a109c720a

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 1922 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  405c7326d2b712d5b212ac4112959f1a109c720a (commit)
      from  4963d555f601367b5da92d3a6dcdfa750a915e0b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 405c7326d2b712d5b212ac4112959f1a109c720a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jun 4 14:32:22 2020 +0000

    core145: Remove double-added configuration lines for OpenVPN
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/145/update.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Difference in files:
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"


hooks/post-receive
--
IPFire 2.x development tree