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 8a2105b2844fdb4b2306a0a27553f01842795535 (commit) via 1f3f2d676eff32f20d32f7ecfea45f235c9355fa (commit) from aa81aaf83646a9cbaf07f0e5358fee66ef6e4c06 (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 8a2105b2844fdb4b2306a0a27553f01842795535 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 27 18:38:35 2020 +0000

core153: Ship updated index.cgi and vpnmain.cgi

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 1f3f2d676eff32f20d32f7ecfea45f235c9355fa Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 31 09:54:42 2020 +0000

IPsec: Fix showing tunnels as connecting when they are established

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/153/filelists/files | 2 ++ html/cgi-bin/index.cgi | 1 + html/cgi-bin/vpnmain.cgi | 1 + 3 files changed, 4 insertions(+)

Difference in files: diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files index b58587e6a..8fd152a6c 100644 --- a/config/rootfiles/core/153/filelists/files +++ b/config/rootfiles/core/153/filelists/files @@ -2,3 +2,5 @@ etc/issue etc/os-release etc/system-release srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 5aec4c594..fdf62361d 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -457,6 +457,7 @@ END if (($line =~ /"$vpnconfig{$key}[1]".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]{.*INSTALLED/ )){ $activecolor = $Header::colourgreen; $activestatus = $Lang::tr{'capsopen'}; + last; } elsif ($line =~ /$vpnconfig{$key}[1][.*CONNECTING/) { $activecolor = $Header::colourorange; $activestatus = $Lang::tr{'vpn connecting'}; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index ae5e80d38..db442e111 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -3019,6 +3019,7 @@ END ($line =~ /$confighash{$key}[1]{.*INSTALLED/)) { $col1="bgcolor='${Header::colourgreen}'"; $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>"; + last; } elsif ($line =~ /$confighash{$key}[1][.*CONNECTING/) { $col1="bgcolor='${Header::colourorange}'"; $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn connecting'}</font></b>";

hooks/post-receive -- IPFire 2.x development tree