[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6522ab474f26751cd1cde863d68a1858a1d1141d

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6522ab474f26751cd1cde863d68a1858a1d1141d

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3368 bytes --]

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  6522ab474f26751cd1cde863d68a1858a1d1141d (commit)
       via  79131c6e47e535452625028477101ec59203e476 (commit)
      from  796aa6b303a20e1e8973e2d52c2544bce4ea6c47 (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 6522ab474f26751cd1cde863d68a1858a1d1141d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 12 10:28:50 2020 +0000

    en: Fix typo in "Port Scans"
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 79131c6e47e535452625028477101ec59203e476
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 12 10:27:15 2020 +0000

    firewall hits graph: Fix order of values
    
    The fields were mixed up and therefore graph showed incorrect
    values.
    
    Fixes: #12496
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/cfgroot/graphs.pl                  | 4 ++--
 config/rootfiles/core/152/filelists/files | 1 +
 langs/en/cgi-bin/en.pl                    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 04f038be1..aced99125 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -700,13 +700,13 @@ sub updatefwhitsgraph {
 		"GPRINT:input:LAST:%8.1lf %sBps\\j",
 		"STACK:newnotsyn".$color{"color14"}."A0:".sprintf("%-25s","NewNotSYN"),
 		"GPRINT:newnotsyn:MAX:%8.1lf %sBps",
-		"GPRINT:newnotsyn:MIN:%8.1lf %sBps",
 		"GPRINT:newnotsyn:AVERAGE:%8.1lf %sBps",
+		"GPRINT:newnotsyn:MIN:%8.1lf %sBps",
 		"GPRINT:newnotsyn:LAST:%8.1lf %sBps\\j",
 		"STACK:portscan".$color{"color16"}."A0:".sprintf("%-25s",$Lang::tr{'portscans'}),
 		"GPRINT:portscan:MAX:%8.1lf %sBps",
-		"GPRINT:portscan:MIN:%8.1lf %sBps",
 		"GPRINT:portscan:AVERAGE:%8.1lf %sBps",
+		"GPRINT:portscan:MIN:%8.1lf %sBps",
 		"GPRINT:portscan:LAST:%8.1lf %sBps\\j",
 		);
 		$ERROR = RRDs::error;
diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files
index 367c4b56a..ceb904c64 100644
--- a/config/rootfiles/core/152/filelists/files
+++ b/config/rootfiles/core/152/filelists/files
@@ -10,3 +10,4 @@ etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/red
 srv/web/ipfire/cgi-bin/credits.cgi
 usr/local/bin/setaliases
+var/ipfire/graphs.pl
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index e632c9faa..27a24e9c9 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2041,7 +2041,7 @@
 'port' => 'Port',
 'port forwarding configuration' => 'Port forwarding configuration',
 'ports' => 'Ports',
-'portscans' => 'portscancs',
+'portscans' => 'Port Scans',
 'pots' => 'Analog classic line',
 'ppp setup' => 'PPP setup',
 'pppoe' => 'PPPoE',


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