[git.ipfire.org] IPFire 2.x development tree branch, core89, updated. 5167bb0dbf6e05a0f66e1012550f323004b740f4

[git.ipfire.org] IPFire 2.x development tree branch, core89, updated. 5167bb0dbf6e05a0f66e1012550f323004b740f4

[git]

[-- Attachment #1: Type: text/plain, Size: 2147 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core89 has been updated
       via  5167bb0dbf6e05a0f66e1012550f323004b740f4 (commit)
       via  3a2e08b29df2e8a7899e8512adad45659a379a0d (commit)
      from  04c1f70d0bf9d40b370c83248e5bce1e11947dbe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5167bb0dbf6e05a0f66e1012550f323004b740f4
Merge: 04c1f70 3a2e08b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Apr 17 22:19:21 2015 +0200

    Merge remote-tracking branch 'origin/master' into core89

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/89/update.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index d98fe7e..665bf43 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
 


hooks/post-receive
--
IPFire 2.x development tree