]> git.ipfire.org Git - people/ummeegge/ipfire-2.x.git/commitdiff
core89: Fix update script again for OpenVPN configuration update
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 18 Apr 2015 10:40:41 +0000 (12:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 18 Apr 2015 10:40:41 +0000 (12:40 +0200)
config/rootfiles/core/89/update.sh

index 196e78bd25d9a27088999b14da4c8c0a3e84a007..13c645a1a2ffacdac7a34bc62ade0b2816bb2a27 100644 (file)
@@ -74,16 +74,18 @@ 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
+       name="${i##*/}"
+       name="${name%*.conf}"
+
        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}
+               echo "status /var/run/openvpn/${name}-n2n 10" >> ${i}
        fi
 done