From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 18 Apr 2015 10:40:41 +0000 (+0200)
Subject: core89: Fix update script again for OpenVPN configuration update
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ba3be2bebcc589243a626d7b958be96b82ba3aa;p=people%2Fms%2Fipfire-2.x.git

core89: Fix update script again for OpenVPN configuration update
---

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