diff options
| author | jim-p <jimp@pfsense.org> | 2015-01-08 08:30:58 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2015-01-08 08:30:58 -0500 |
| commit | 4510e208048adb9cc517000388e46b433ae8f23e (patch) | |
| tree | 7cfb1492e6fae09f303a4d07d3ec456230e169d5 | |
| parent | 1b12d3669d1cb1e0b74943fc6e6fe552f6500b9e (diff) | |
| parent | 782aaa0d534cf731b5a92d6889f8f7ab69188025 (diff) | |
| download | pfsense-packages-4510e208048adb9cc517000388e46b433ae8f23e.tar.gz pfsense-packages-4510e208048adb9cc517000388e46b433ae8f23e.tar.bz2 pfsense-packages-4510e208048adb9cc517000388e46b433ae8f23e.zip | |
Merge pull request #771 from CinoNY/master
| -rw-r--r-- | config/ntopng/ntopng.xml | 15 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 16 insertions, 5 deletions
diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml index 45b68bdc..b656e483 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 -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, @@ -238,4 +249,4 @@ } ]]> </custom_php_validation_command> -</packagegui>
\ No newline at end of file +</packagegui> 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> 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> 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> |