]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
core89: Fix script that updates OpenVPN configuration files
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Apr 2015 16:20:40 +0000 (18:20 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 17 Apr 2015 16:20:40 +0000 (18:20 +0200)
config/rootfiles/core/89/update.sh

index 90a6d776b09e0434967660d186635a4836265500..196e78bd25d9a27088999b14da4c8c0a3e84a007 100644 (file)
@@ -75,15 +75,15 @@ chown nobody.nobody \
        /var/run/ovpnserver.log
 
 # Update OpenVPN/collectd configuration
-files=`find /var/ipfire/ovpn/n2nconf/ -type d`
-for i in $files;
-do
-       if ! grep -q "status-version" $i/${i##*/}.conf; then
-               echo "# Logfile" >> $i/${i##*/}.conf
-               echo "status-version 1" >> $i/${i##*/}.conf
+# 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 -q "status " $i/${i##*/}.conf; then
-               echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf
+
+       if ! grep -qE "^status " ${i}; then
+               echo "status /var/run/openvpn/${i##*/}-n2n 10" >> ${i}
        fi
 done