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 3a2e08b29df2e8a7899e8512adad45659a379a0d (commit) from c02327515412b1b3ffe147275623b8475fe03b1c (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 3a2e08b29df2e8a7899e8512adad45659a379a0d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 17 18:20:40 2015 +0200

core89: Fix script that updates OpenVPN configuration files

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

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 90a6d77..196e78b 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