[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0a11f8761ae9464e6321e2259899c3d5ec71a7a4

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0a11f8761ae9464e6321e2259899c3d5ec71a7a4

[git]

[-- Attachment #1: Type: text/plain, Size: 1726 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, next has been updated
       via  0a11f8761ae9464e6321e2259899c3d5ec71a7a4 (commit)
      from  92a6d92e826f056ae788da902dffb0513f1152df (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 0a11f8761ae9464e6321e2259899c3d5ec71a7a4
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Wed Apr 22 15:02:02 2015 +0200

    BUG10812: change ovpnserver config if needed

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

Summary of changes:
 config/rootfiles/core/90/update.sh | 5 +++++
 1 file changed, 5 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index 5e09240..270da21 100644
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -172,6 +172,11 @@ if [ ! -e "/var/ipfire/fwhosts/customgeoipgrp" ]; then
 	chown nobody:nobody /var/ipfire/fwhosts/customgeoipgrp
 fi
 
+#Fix BUG10812 (openvpn server.conf has wrong collectd logfile path)
+if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpnserver.conf; then
+	sed -i "s/\/var\/log\/ovpnserver.log 30/\/var\/run\/ovpnserver.log 30/" /var/ipfire/ovpn/server.conf
+fi
+
 # Download/Update GeoIP databases.
 /usr/local/bin/xt_geoip_update
 


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