[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9ba3be2bebcc589243a626d7b958be96b82ba3aa

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9ba3be2bebcc589243a626d7b958be96b82ba3aa

[git]

[-- Attachment #1: Type: text/plain, Size: 1829 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, master has been updated
       via  9ba3be2bebcc589243a626d7b958be96b82ba3aa (commit)
      from  3a2e08b29df2e8a7899e8512adad45659a379a0d (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 9ba3be2bebcc589243a626d7b958be96b82ba3aa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Apr 18 12:40:41 2015 +0200

    core89: Fix update script again for OpenVPN configuration update

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

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

Difference in files:
diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index 196e78b..13c645a 100644
--- a/config/rootfiles/core/89/update.sh
+++ b/config/rootfiles/core/89/update.sh
@@ -75,15 +75,17 @@ chown nobody.nobody \
 	/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
 


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