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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 3154 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  2f075ff8cfd3ff9c169a878a769f351b75d84f67 (commit)
       via  7dfcaef067115be24633f300ef76461ebc2b29c1 (commit)
      from  daf34294f233a414cd14d08b1269b8192b591096 (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 2f075ff8cfd3ff9c169a878a769f351b75d84f67
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Mon Apr 13 16:26:48 2015 +0200

    vpn-statistic: add URI::escape for openvpn names with special chars

commit 7dfcaef067115be24633f300ef76461ebc2b29c1
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Tue Apr 14 11:53:28 2015 +0200

    vpn-statistic: add collectd parameters to imported n2n packages

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

Summary of changes:
 html/cgi-bin/netovpnrw.cgi | 4 ++--
 html/cgi-bin/ovpnmain.cgi  | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi
index fed6d4d..cae7770 100755
--- a/html/cgi-bin/netovpnrw.cgi
+++ b/html/cgi-bin/netovpnrw.cgi
@@ -20,7 +20,7 @@
 ###############################################################################
 
 use strict;
-
+use URI::Escape;
 # enable only the following on debugging purpose
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
@@ -37,7 +37,7 @@ my %mainsettings = ();
 
 my @vpns=();
 
-my @querry = split(/\?/,$ENV{'QUERY_STRING'});
+my @querry = split(/\?/,uri_unescape($ENV{'QUERY_STRING'}));
 $querry[0] = '' unless defined $querry[0];
 $querry[1] = 'week' unless defined $querry[1];
 
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 7ca62de..ece528a 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -3197,7 +3197,6 @@ END
 		@firen2nconf = <FILE>;
 		close (FILE);
 		chomp(@firen2nconf);
-
 	} else {
 
 		$errormessage = "Filecount does not match only 2 files are allowed\n";
@@ -3238,6 +3237,13 @@ END
     unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";}
     unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";}   
 
+	#Add collectd settings to configfile
+	open(FILE, ">> $tempdir/$uplconffilename") or die 'Unable to open config file.';
+	print FILE "# Logfile\n";
+	print FILE "status-version 1\n";
+	print FILE "status /var/run/openvpn/$n2nname[0]-n2n 10\n";
+	close FILE;
+
 	move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename2");
 
 	if ($? ne 0) {


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