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

This commit is contained in:
Arne Fitzenreiter
2012-12-17 10:16:46 +01:00
6 changed files with 20 additions and 5 deletions

View File

@@ -1,13 +1,15 @@
#!/usr/bin/perl
# Converter script for old openvpn clients
my %net=();
my %ovpnconfig=();
my @serverconf=();
my $greennet;
my $greensubnet;
my $running='off';
require '/var/ipfire/general-functions.pl';
require '/var/ipfire/general-functions.pl';
unless (-d "${General::swroot}/ovpn/ccd") { system("mkdir ${General::swroot}/ovpn/ccd"); }
system ("chown nobody.nobody ${General::swroot}/ovpn/ccd");
if ( -e "/var/run/openvpn.pid"){
$running='on';
system('/usr/local/bin/openvpnctrl', '-k');
@@ -46,3 +48,4 @@ if ($running eq 'on')
{
system('/usr/local/bin/openvpnctrl', '-s');
}
system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*");