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 1ca4d1d2ae9c983fa89ec16e2765223008743637 (commit) via 9ba3be2bebcc589243a626d7b958be96b82ba3aa (commit) from 5167bb0dbf6e05a0f66e1012550f323004b740f4 (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 1ca4d1d2ae9c983fa89ec16e2765223008743637 Merge: 5167bb0 9ba3be2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Apr 18 14:27:13 2015 +0200

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

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

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 665bf43..ade1343 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