webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 08:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2015-04-14 17:59:21 +02:00
parent 0778b991c9 2f075ff8cf
commit 65f2c9bb39
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/cgi-bin/netovpnrw.cgi
View File

@@ -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];

8
html/cgi-bin/ovpnmain.cgi
View File

@@ -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) {