Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2020-06-04 15:16:39 +00:00

View 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"