Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/oldcore/145/update.sh b/config/rootfiles/oldcore/145/update.sh
index 893539f30467bc6ae478fd546a8d6563aaeb82d8..38653b7306b01d7e49dcb41b9643abbf0443ee0b 100644 (file)
--- a/config/rootfiles/oldcore/145/update.sh
+++ b/config/rootfiles/oldcore/145/update.sh
@@ -78,7 +78,7 @@ for package in perl-DBI perl-DBD-SQLite; do
 done
 
 # Enable OpenVPN metrics collection
-cat <<EOF >> /var/ipfire/ovpn/server.conf
+grep -q "^client-connect" /var/ipfire/ovpn/server.conf || 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"