From 7868071344a84a70c88d39cdd8de159ba82db782 Mon Sep 17 00:00:00 2001
From: Cino <cinony@gmail.com>
Date: Wed, 7 Jan 2015 20:30:49 -0500
Subject: ntopng - add checkbox to enable historical data storage

add checkbox to enable historical data storage

ntopng Command Line Options:
--dump-flows | -F
Dump expired flows. If ntopng is compiled with sqlite support, flows can dumped persistently on disk using this option. Databases are created daily under /db.

https://forum.pfsense.org/index.php?topic=80461.msg473467#msg473467
---
 config/ntopng/ntopng.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml
index 45b68bdc..82999978 100644
--- a/config/ntopng/ntopng.xml
+++ b/config/ntopng/ntopng.xml
@@ -118,6 +118,12 @@
 				<option><value>lanonly</value><name>Consider only LAN interface local</name></option>
 			</options>
 		</field>
+		<field>
+			<fielddescr>Historical Data Storage</fielddescr>
+			<fieldname>dump_flows</fieldname>
+			<description>Turn historical data storages on</description>
+			<type>checkbox</type>
+		</field>
 	</fields>
 	<custom_php_global_functions>
 	<![CDATA[
@@ -175,6 +181,11 @@
 				break;
 		}
 
+		// Historical Data Storage, Dump expired flows
+		if ($ntopng_config['dump_flows'] >= on) {
+			$dump_flows = "-F";
+		}
+		
 		$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
 		if ($pf_version >= 2.2) {
 			$redis_path = "/usr/pbi/ntopng-" . php_uname("m") . "/local/bin";
@@ -188,7 +199,7 @@
 		//  Add support for --data-dir /somewhere, --httpdocs-dir /somewhereelse,
 		//  --dump-timeline (on/off) --http-port, --https-port
 
-		$start .= "\t/usr/local/bin/ntopng -s -e {$ifaces} {$dns_mode} {$aggregations} {$local_networks} &";
+		$start .= "\t/usr/local/bin/ntopng -s -e {$dump_flows} {$ifaces} {$dns_mode} {$aggregations} {$local_networks} &";
 		write_rcfile(array(
 					"file" => "ntopng.sh",
 					"start" => $start,
@@ -238,4 +249,4 @@
 	}
 	]]>
 	</custom_php_validation_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
-- 
cgit v1.2.3


From e0d0d5a32d05ac59d7b5efaf77eefd0b5bf28995 Mon Sep 17 00:00:00 2001
From: Cino <cinony@gmail.com>
Date: Wed, 7 Jan 2015 20:39:20 -0500
Subject: ntop - change location of database and pid

changed database/pid location to /var/db/ntopng and /var/run/ntopng.pid
It was defaulting to /var/tmp/ntopng

 -d /var/db/ntopng -G /var/run/ntopng.pid
---
 config/ntopng/ntopng.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml
index 82999978..b656e483 100644
--- a/config/ntopng/ntopng.xml
+++ b/config/ntopng/ntopng.xml
@@ -199,7 +199,7 @@
 		//  Add support for --data-dir /somewhere, --httpdocs-dir /somewhereelse,
 		//  --dump-timeline (on/off) --http-port, --https-port
 
-		$start .= "\t/usr/local/bin/ntopng -s -e {$dump_flows} {$ifaces} {$dns_mode} {$aggregations} {$local_networks} &";
+		$start .= "\t/usr/local/bin/ntopng -d /var/db/ntopng -G /var/run/ntopng.pid -s -e {$dump_flows} {$ifaces} {$dns_mode} {$aggregations} {$local_networks} &";
 		write_rcfile(array(
 					"file" => "ntopng.sh",
 					"start" => $start,
-- 
cgit v1.2.3


From 5b7db3419ae520c2e031a17274cd2261a6043776 Mon Sep 17 00:00:00 2001
From: Cino <cinony@gmail.com>
Date: Thu, 8 Jan 2015 06:55:21 -0500
Subject: update ntopng version

---
 pkg_config.10.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index c66f7909..d06dc9a2 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -258,7 +258,7 @@
 			<ports_before>databases/redis databases/gdbm net/GeoIP x11-fonts/font-util x11-fonts/webfonts graphics/graphviz</ports_before>
 			<port>net/ntopng</port>
 		</build_pbi>
-		<version>1.2.1 v0.2</version>
+		<version>1.2.1 v0.3</version>
 		<status>ALPHA</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/ntopng/ntopng.xml</config_file>
-- 
cgit v1.2.3


From 85f6996c516c7b54adfe035f08ad866f8654e9c4 Mon Sep 17 00:00:00 2001
From: Cino <cinony@gmail.com>
Date: Thu, 8 Jan 2015 06:56:53 -0500
Subject: update ntopng version

---
 pkg_config.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index da853b8f..ea9340dc 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -365,7 +365,7 @@
 			<ports_before>databases/redis databases/gdbm net/GeoIP x11-fonts/font-util x11-fonts/webfonts graphics/graphviz</ports_before>
 			<port>net/ntopng</port>
 		</build_pbi>
-		<version>1.1 v0.2</version>
+		<version>1.1 v0.3</version>
 		<status>ALPHA</status>
 		<required_version>2.1.4</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/ntopng/ntopng.xml</config_file>
-- 
cgit v1.2.3


From 782aaa0d534cf731b5a92d6889f8f7ab69188025 Mon Sep 17 00:00:00 2001
From: Cino <cinony@gmail.com>
Date: Thu, 8 Jan 2015 06:58:54 -0500
Subject: update ntopng version

---
 pkg_config.8.xml.amd64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 251d7214..92d92277 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -352,7 +352,7 @@
 			<ports_before>databases/redis databases/gdbm net/GeoIP x11-fonts/font-util x11-fonts/webfonts graphics/graphviz</ports_before>
 			<port>net/ntopng</port>
 		</build_pbi>
-		<version>1.1 v0.2</version>
+		<version>1.1 v0.3</version>
 		<status>ALPHA</status>
 		<required_version>2.1.4</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/ntopng/ntopng.xml</config_file>
-- 
cgit v1.2.3