openvpn: Fix wrong default port number.

[people/teissler/ipfire-2.x.git] / src / scripts / ovpn-ccd-convert

diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert
index 86b7c94a56a62e8bdeaa3a31f6f3a4a346c1bcc6..7aa8cf13ea42106ce2abba086b6d7ce886fcfbb9 100644 (file)
--- a/src/scripts/ovpn-ccd-convert
+++ b/src/scripts/ovpn-ccd-convert
@@ -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');
@@ -29,6 +31,7 @@ open(FILE,"/var/ipfire/ovpn/server.conf");
 &General::readhasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig);
 foreach my $key (keys %ovpnconfig){
        if($ovpnconfig{$key}[32] eq '' && $ovpnconfig{$key}[3] eq 'host'){
+               $ovpnconfig{$key}[2] =~ s/ /_/gi;
                open ( CCDRWCONF,'>',"/var/ipfire/ovpn/ccd/$ovpnconfig{$key}[2]") or die "Unable to create clientconfigfile $!";
                print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n";
                print CCDRWCONF "#This client uses the dynamic pool\n\n";
@@ -46,3 +49,4 @@ if ($running eq 'on')
 {
        system('/usr/local/bin/openvpnctrl', '-s');
 }
+system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*");