Fix server error at certificate upload.

Enabled ipsec on local networks.
This commit is contained in:
Arne Fitzenreiter
2010-05-10 17:40:42 +02:00
parent 3343fb68e9
commit b4f6d69810

View File

@@ -248,9 +248,9 @@ sub writeipsecfiles {
foreach my $key (keys %lconfighash) { foreach my $key (keys %lconfighash) {
next if ($lconfighash{$key}[0] ne 'on'); next if ($lconfighash{$key}[0] ne 'on');
$interfaces .= "%defaultroute " if ($interfaces !~ /defaultroute/ && $lconfighash{$key}[26] eq 'RED'); $interfaces .= "%defaultroute " if ($interfaces !~ /defaultroute/ && $lconfighash{$key}[26] eq 'RED');
#$interfaces .= "ipsec1=$netsettings{'GREEN_DEV'} " if ($interfaces !~ /ipsec1/ && $lconfighash{$key}[26] eq 'GREEN'); $interfaces .= "$netsettings{'GREEN_DEV'} " if ($interfaces !~ /ipsec1/ && $lconfighash{$key}[26] eq 'GREEN');
#$interfaces .= "ipsec2=$netsettings{'BLUE_DEV'} " if ($interfaces !~ /ipsec2/ && $lconfighash{$key}[26] eq 'BLUE'); $interfaces .= "$netsettings{'BLUE_DEV'} " if ($interfaces !~ /ipsec2/ && $lconfighash{$key}[26] eq 'BLUE');
#$interfaces .= "ipsec3=$netsettings{'ORANGE_DEV'} " if ($interfaces !~ /ipsec3/ && $lconfighash{$key}[26] eq 'ORANGE'); $interfaces .= "$netsettings{'ORANGE_DEV'} " if ($interfaces !~ /ipsec3/ && $lconfighash{$key}[26] eq 'ORANGE');
} }
print CONF $interfaces . "\"\n"; print CONF $interfaces . "\"\n";
@@ -581,7 +581,8 @@ END
$cahash{$key}[0] = $cgiparams{'CA_NAME'}; $cahash{$key}[0] = $cgiparams{'CA_NAME'};
$cahash{$key}[1] = &Header::cleanhtml(getsubjectfromcert ("${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem")); $cahash{$key}[1] = &Header::cleanhtml(getsubjectfromcert ("${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem"));
&General::writehasharray("${General::swroot}/vpn/caconfig", \%cahash); &General::writehasharray("${General::swroot}/vpn/caconfig", \%cahash);
system('/usr/local/bin/ipsecctrl', 'R');
my $temp = `/usr/local/bin/ipsecctrl R`;
sleep $sleepDelay; sleep $sleepDelay;
UPLOADCA_ERROR: UPLOADCA_ERROR: