core89: Fix script that updates OpenVPN configuration files

[ipfire-2.x.git] / config / rootfiles / core / 89 / update.sh

diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index 435b453623e78648a2db0c821d3344ffa9682559..196e78bd25d9a27088999b14da4c8c0a3e84a007 100644 (file)
--- a/config/rootfiles/core/89/update.sh
+++ b/config/rootfiles/core/89/update.sh
@@ -68,16 +68,28 @@ rm -f \
        /opt/pakfire/db/*/meta-sqlite \
        /opt/pakfire/db/rootfiles/sqlite
 
-# Update OpenVPN/collectd configuration
-/usr/sbin/ovpn-collectd-convert
-chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
-
 mkdir -p /var/run/openvpn
 touch /var/run/ovpnserver.log
 chown nobody.nobody \
        /var/run/openvpn \
        /var/run/ovpnserver.log
 
+# Update OpenVPN/collectd configuration
+# Update OpenVPN/collectd configuration
+for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do
+       if ! grep -qE "^status-version" ${i}; then
+               echo "# Logfile" >> ${i}
+               echo "status-version 1" >> ${i}
+       fi
+
+       if ! grep -qE "^status " ${i}; then
+               echo "status /var/run/openvpn/${i##*/}-n2n 10" >> ${i}
+       fi
+done
+
+/usr/sbin/ovpn-collectd-convert
+chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
+
 # Fix permissions
 chown nobody.nobody /var/ipfire/dns