From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 17 Apr 2015 16:20:40 +0000 (+0200)
Subject: core89: Fix script that updates OpenVPN configuration files
X-Git-Tag: v2.17-core91~30^2^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a2e08b29df2e8a7899e8512adad45659a379a0d;p=ipfire-2.x.git

core89: Fix script that updates OpenVPN configuration files
---

diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index 90a6d776b0..196e78bd25 100644
--- a/config/rootfiles/core/89/update.sh
+++ b/config/rootfiles/core/89/update.sh
@@ -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