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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2538 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  c63e97bbaf668813ed221d4bcad9019429705a31 (commit)
       via  462056ad86e97384b48705a0655aa701147c5167 (commit)
      from  5c3b3bd8e19fbcecfc7beb629a9c23b454c3a09e (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 c63e97bbaf668813ed221d4bcad9019429705a31
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Sat Apr 11 07:12:32 2015 +0200

    vpn-statistic: fix removal of rw rrd-data
    
    Due to a missing slash the rrd data of a deleted rrd-connection was not
    deleted

commit 462056ad86e97384b48705a0655aa701147c5167
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Sat Apr 11 05:34:34 2015 +0200

    vpn-statistic: move collectd converter to the right place
    
    Build of cdrom will fail if the converter script is not moved to the
    right place

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

Summary of changes:
 lfs/stage2                   | 3 ++-
 src/misc-progs/openvpnctrl.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/lfs/stage2 b/lfs/stage2
index 895ee15..53f81d1 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -101,7 +101,8 @@ $(TARGET) :
 
 	# Move script to correct place.
 	mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/
-
+	mv -vf /usr/local/bin/ovpn-collectd-convert /usr/sbin/
+	
 	# Install firewall scripts.
 	mkdir -pv /usr/lib/firewall
 	install -m 755 $(DIR_SRC)/config/firewall/rules.pl \
diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c
index bba84ca..20967e4 100644
--- a/src/misc-progs/openvpnctrl.c
+++ b/src/misc-progs/openvpnctrl.c
@@ -605,7 +605,7 @@ int deleterrd(char *name) {
 
 		// Handle RW connections
 		if (strcmp(conn->type, "host") == 0) {
-			snprintf(rrd_dir, STRING_SIZE - 1, "/var/log/rrd/collectd/localhost/openvpn-%s", name);
+			snprintf(rrd_dir, STRING_SIZE - 1, "/var/log/rrd/collectd/localhost/openvpn-%s/", name);
 
 		// Handle N2N connections
 		} else if (strcmp(conn->type, "net") == 0) {


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