Some changes for strongswan.

Still need a replacement for ipsec auto --replace
This commit is contained in:
Arne Fitzenreiter
2010-03-27 21:15:46 +01:00
parent 5e21bae9cd
commit db073a101e
6 changed files with 63 additions and 197 deletions

View File

@@ -337,7 +337,7 @@ END
if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
`cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) {
my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
my @status = `/usr/sbin/ipsec auto --status`;
my @status = `/usr/local/bin/ipsecctrl I`;
my %confighash = ();
&General::readhasharray("${General::swroot}/vpn/config", \%confighash);
print <<END;

View File

@@ -2387,7 +2387,7 @@ EOF
&General::readhasharray("${General::swroot}/vpn/config", \%confighash);
$cgiparams{'CA_NAME'} = '';
my @status = `/usr/sbin/ipsec auto --status`;
my @status = `/usr/local/bin/ipsecctrl I`;
# suggest a default name for this side
if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") {