This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 5532265c3ca1c01cd0a2d3b2a893b5fbac606faa (commit) via 57ba1e9023b0f1f3499cc888f66827a81574bb41 (commit) from a3323b6fde7a475aba2d4491fd0df98a0dcfaf89 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 5532265c3ca1c01cd0a2d3b2a893b5fbac606faa Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jun 26 23:18:32 2011 +0200
ipsec: add ike version connection table.
commit 57ba1e9023b0f1f3499cc888f66827a81574bb41 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jun 26 23:16:41 2011 +0200
ipsec: change check if a ikev2 tunnel is up.
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/index.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 32ae7ff..eec3f9b 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -370,7 +370,7 @@ END } else { foreach my $line (@status) { if (($line =~ /"$confighash{$key}[1]".*IPsec SA established/) || - ($line =~/ $confighash{$key}[1][.*ESTABLISHED/ )) + ($line =~/ $confighash{$key}[1]{.*INSTALLED/ )) { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 3d5a360..1fa40a8 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2527,7 +2527,7 @@ END print "<tr bgcolor='$color{'color22'}'>\n"; } print "<td align='center' nowrap='nowrap'>$confighash{$key}[1]</td>"; - print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>"; + print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ") $confighash{$key}[29]</td>"; if ($confighash{$key}[2] eq '%auth-dn') { print "<td align='left' nowrap='nowrap'>$confighash{$key}[9]</td>"; } elsif ($confighash{$key}[4] eq 'cert') { @@ -2540,7 +2540,7 @@ END my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; foreach my $line (@status) { if (($line =~ /"$confighash{$key}[1]".*IPsec SA established/) || - ($line =~ / $confighash{$key}[1][.*ESTABLISHED/)) + ($line =~ / $confighash{$key}[1]{.*INSTALLED/)) { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; }
hooks/post-receive -- IPFire 2.x development tree