From 86c67c0e6ecc177227896d09176e02d7486732fd Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 12 Aug 2014 16:02:36 -0400
Subject: Add skeleton for ntopng, not active to install yet.

---
 config/ntopng/ntop.xml | 178 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 config/ntopng/ntop.xml

(limited to 'config/ntopng')

diff --git a/config/ntopng/ntop.xml b/config/ntopng/ntop.xml
new file mode 100644
index 00000000..4db9e9c8
--- /dev/null
+++ b/config/ntopng/ntop.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
+<packagegui>
+	<copyright>
+	<![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+	authng.xml
+	part of pfSense (http://www.pfSense.com)
+	Copyright (C) 2008 Scott Ullrich
+	All rights reserved.
+*/
+/* ========================================================================== */
+/*
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	 1. Redistributions of source code must retain the above copyright notice,
+		this list of conditions and the following disclaimer.
+
+	 2. Redistributions in binary form must reproduce the above copyright
+		notice, this list of conditions and the following disclaimer in the
+		documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ========================================================================== */
+	]]>
+	</copyright>
+	<name>ntop</name>
+	<version>3.0</version>
+	<title>Diagnostics: ntop Settings</title>
+	<savetext>Change</savetext>
+	<aftersaveredirect>pkg_edit.php?xml=ntop.xml&amp;id=0</aftersaveredirect>
+	<menu>
+		<name>ntop Settings</name>
+		<tooltiptext>Set ntop settings such as password and port.</tooltiptext>
+		<section>Diagnostics</section>
+		<url>/pkg_edit.php?xml=ntop.xml&amp;id=0</url>
+	</menu>
+	<menu>
+		<name>ntop</name>
+		<tooltiptext>Access ntop</tooltiptext>
+		<section>Diagnostics</section>
+		<url>http://$myurl:3000</url>
+		<depends_on_service>ntop</depends_on_service>
+	</menu>
+	<service>
+		<name>ntop</name>
+		<rcfile>ntop.sh</rcfile>
+		<executable>ntop</executable>
+		<description>NTOP bandwidth monitoring/graphing</description>
+	</service>
+	<tabs>
+		<tab>
+			<text>ntop Settings</text>
+			<url>/pkg_edit.php?xml=ntop.xml&amp;id=0</url>
+			<active/>
+		</tab>
+		<tab>
+			<text>Access ntop</text>
+			<url>http://$myurl:3000</url>
+		</tab>
+	</tabs>
+	<fields>
+		<field>
+			<fielddescr>ntop Admin Password</fielddescr>
+			<fieldname>password</fieldname>
+			<description>Enter the password for the NTOP Web GUI.  Minimum 5 characters.</description>
+			<type>password</type>
+		</field>
+		<field>
+			<fielddescr>ntop Admin Password AGAIN</fielddescr>
+			<fieldname>passwordagain</fieldname>
+			<type>password</type>
+		</field>
+		<field>
+			<fielddescr>Interface</fielddescr>
+			<fieldname>interface_array</fieldname>
+			<type>interfaces_selection</type>
+			<size>3</size>
+			<value>lan</value>
+			<multiple>true</multiple>
+		</field>
+		<field>
+			<fielddescr>Allow merging interfaces&lt;br&gt;(Def: Do not merge)</fielddescr>
+			<fieldname>allowmerge</fieldname>
+			<type>checkbox</type>
+		</field>
+	</fields>
+	<custom_php_global_functions>
+	<![CDATA[
+	function sync_package_ntop() {
+		conf_mount_rw();
+		config_lock();
+		global $config;
+		global $input_errors;
+		if ($_POST) {
+			$config['installedpackages']['ntop']['config'] = array();
+			$config['installedpackages']['ntop']['config'][0] = $_POST;
+		}
+		$ntop_config =& $config['installedpackages']['ntop']['config'][0];
+		$if_final = "";
+		$ifaces_final = "";
+		system("/bin/mkdir -p /var/db/ntop");
+		system("/bin/mkdir -p /var/db/ntop/rrd");
+		system("/bin/mkdir -p /var/db/ntop/rrd/graphics");
+		system("/bin/chmod -R 755 /var/db/ntop");
+		system("/usr/sbin/chown -R nobody:nobody /var/db/ntop");
+		system("/bin/cp -Rp /usr/local/lib/X11/fonts/webfonts/ /usr/local/lib/X11/fonts/TTF/");
+		$first = 0;
+		$mergeifs = ($ntop_config['allowmerge'] == "on") ? "" : "-M";
+		foreach($ntop_config['interface_array'] as $iface) {
+		$if = convert_friendly_interface_to_real_interface_name($iface);
+		if($if) {
+			if($first == 1)
+			$ifaces_final .= ",";
+			$ifaces_final .= $if;
+			$first = 1;
+		}
+		}
+		$start = "/usr/local/bin/ntop -i {$ifaces_final} -u root -d -4 {$mergeifs} -x 8102 -X 8192 &";
+		write_rcfile(array(
+					"file" => "ntop.sh",
+					"start" => $start,
+					"stop" => "/usr/bin/killall ntop"
+				)
+		);
+		if (is_service_running("ntop")) {
+			stop_service("ntop");
+			// Wait for ntop to shut down cleanly.
+			sleep(20);
+		}
+		if (empty($ntop_config['password']))
+			$ntop_config['password'] = "admin";
+		unlink_if_exists("/var/db/ntop/ntop_pw.db");
+		exec("/usr/local/bin/ntop --set-admin-password={$ntop_config['password']}");
+		sleep(2);
+		start_service("ntop");
+		conf_mount_ro();
+		config_unlock();
+	}
+	]]>
+	</custom_php_global_functions>
+	<custom_add_php_command>
+		sync_package_ntop();
+	</custom_add_php_command>
+	<custom_php_resync_config_command>
+		sync_package_ntop();
+	</custom_php_resync_config_command>
+	<custom_php_install_command>
+		sync_package_ntop();
+	</custom_php_install_command>
+	<custom_php_deinstall_command>
+		exec("rm /usr/local/etc/rc.d/ntop*");
+	</custom_php_deinstall_command>
+	<custom_php_validation_command>
+	<![CDATA[
+	if ($_POST) {
+		if (empty($_POST['password']) || empty($_POST['passwordagain']))
+			$input_errors[] = "You must provide (and confirm) ntop's password.";
+		if ($_POST['password'] != $_POST['passwordagain'])
+			$input_errors[] = "The provided passwords did not match.";
+	}
+	]]>
+	</custom_php_validation_command>
+</packagegui>
\ No newline at end of file
-- 
cgit v1.2.3


From 959f67b23ea8f594cdcba150dd88e6b8aabb9251 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 12 Aug 2014 16:33:03 -0400
Subject: Some blind changes to correct for ntopng differences.

---
 config/ntopng/ntop.xml | 119 +++++++++++++++++++++++--------------------------
 1 file changed, 57 insertions(+), 62 deletions(-)

(limited to 'config/ntopng')

diff --git a/config/ntopng/ntop.xml b/config/ntopng/ntop.xml
index 4db9e9c8..20582c86 100644
--- a/config/ntopng/ntop.xml
+++ b/config/ntopng/ntop.xml
@@ -7,9 +7,9 @@
 /* $Id$ */
 /* ========================================================================== */
 /*
-	authng.xml
+	ntopng.xml
 	part of pfSense (http://www.pfSense.com)
-	Copyright (C) 2008 Scott Ullrich
+	Copyright (C) 2014 ESF, LLC
 	All rights reserved.
 */
 /* ========================================================================== */
@@ -38,50 +38,50 @@
 /* ========================================================================== */
 	]]>
 	</copyright>
-	<name>ntop</name>
-	<version>3.0</version>
-	<title>Diagnostics: ntop Settings</title>
+	<name>ntopng</name>
+	<version>1.1 v0.1</version>
+	<title>Diagnostics: ntopng Settings</title>
 	<savetext>Change</savetext>
-	<aftersaveredirect>pkg_edit.php?xml=ntop.xml&amp;id=0</aftersaveredirect>
+	<aftersaveredirect>pkg_edit.php?xml=ntopng.xml</aftersaveredirect>
 	<menu>
-		<name>ntop Settings</name>
-		<tooltiptext>Set ntop settings such as password and port.</tooltiptext>
+		<name>ntopng Settings</name>
+		<tooltiptext>Set ntopng settings such as password and port.</tooltiptext>
 		<section>Diagnostics</section>
-		<url>/pkg_edit.php?xml=ntop.xml&amp;id=0</url>
+		<url>/pkg_edit.php?xml=ntopng.xml&amp;id=0</url>
 	</menu>
 	<menu>
-		<name>ntop</name>
-		<tooltiptext>Access ntop</tooltiptext>
+		<name>ntopng</name>
+		<tooltiptext>Access ntopng</tooltiptext>
 		<section>Diagnostics</section>
-		<url>http://$myurl:3000</url>
-		<depends_on_service>ntop</depends_on_service>
+		<url>https://$myurl:3001</url>
+		<depends_on_service>ntopng</depends_on_service>
 	</menu>
 	<service>
-		<name>ntop</name>
-		<rcfile>ntop.sh</rcfile>
-		<executable>ntop</executable>
-		<description>NTOP bandwidth monitoring/graphing</description>
+		<name>ntopng</name>
+		<rcfile>ntopng.sh</rcfile>
+		<executable>ntopng</executable>
+		<description>ntopng bandwidth monitoring/graphing</description>
 	</service>
 	<tabs>
 		<tab>
-			<text>ntop Settings</text>
+			<text>ntopng Settings</text>
 			<url>/pkg_edit.php?xml=ntop.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Access ntop</text>
-			<url>http://$myurl:3000</url>
+			<text>Access ntopng</text>
+			<url>https://$myurl:3001</url>
 		</tab>
 	</tabs>
 	<fields>
 		<field>
-			<fielddescr>ntop Admin Password</fielddescr>
+			<fielddescr>ntopng Admin Password</fielddescr>
 			<fieldname>password</fieldname>
-			<description>Enter the password for the NTOP Web GUI.  Minimum 5 characters.</description>
+			<description>Enter the password for the ntopng GUI.  Minimum 5 characters, defaults to admin.</description>
 			<type>password</type>
 		</field>
 		<field>
-			<fielddescr>ntop Admin Password AGAIN</fielddescr>
+			<fielddescr>Confirm ntopng Admin Password</fielddescr>
 			<fieldname>passwordagain</fieldname>
 			<type>password</type>
 		</field>
@@ -93,83 +93,78 @@
 			<value>lan</value>
 			<multiple>true</multiple>
 		</field>
-		<field>
-			<fielddescr>Allow merging interfaces&lt;br&gt;(Def: Do not merge)</fielddescr>
-			<fieldname>allowmerge</fieldname>
-			<type>checkbox</type>
-		</field>
 	</fields>
 	<custom_php_global_functions>
 	<![CDATA[
-	function sync_package_ntop() {
+	function sync_package_ntopng() {
 		conf_mount_rw();
 		config_lock();
 		global $config;
 		global $input_errors;
 		if ($_POST) {
-			$config['installedpackages']['ntop']['config'] = array();
-			$config['installedpackages']['ntop']['config'][0] = $_POST;
+			$config['installedpackages']['ntopng']['config'] = array();
+			$config['installedpackages']['ntopng']['config'][0] = $_POST;
 		}
-		$ntop_config =& $config['installedpackages']['ntop']['config'][0];
+		$ntopng_config =& $config['installedpackages']['ntopng']['config'][0];
 		$if_final = "";
 		$ifaces_final = "";
-		system("/bin/mkdir -p /var/db/ntop");
-		system("/bin/mkdir -p /var/db/ntop/rrd");
-		system("/bin/mkdir -p /var/db/ntop/rrd/graphics");
-		system("/bin/chmod -R 755 /var/db/ntop");
-		system("/usr/sbin/chown -R nobody:nobody /var/db/ntop");
+		system("/bin/mkdir -p /var/db/ntopng");
+		system("/bin/mkdir -p /var/db/ntopng/rrd");
+		system("/bin/mkdir -p /var/db/ntopng/rrd/graphics");
+		system("/bin/chmod -R 755 /var/db/ntopng");
+		system("/usr/sbin/chown -R nobody:nobody /var/db/ntopng");
 		system("/bin/cp -Rp /usr/local/lib/X11/fonts/webfonts/ /usr/local/lib/X11/fonts/TTF/");
 		$first = 0;
-		$mergeifs = ($ntop_config['allowmerge'] == "on") ? "" : "-M";
-		foreach($ntop_config['interface_array'] as $iface) {
-		$if = convert_friendly_interface_to_real_interface_name($iface);
-		if($if) {
-			if($first == 1)
-			$ifaces_final .= ",";
-			$ifaces_final .= $if;
-			$first = 1;
-		}
+		foreach($ntopng_config['interface_array'] as $iface) {
+			$if = convert_friendly_interface_to_real_interface_name($iface);
+			if ($if) {
+				$ifaces .= " " . escapeshellarg("-i {$if}");
+			}
 		}
-		$start = "/usr/local/bin/ntop -i {$ifaces_final} -u root -d -4 {$mergeifs} -x 8102 -X 8192 &";
+		// TODO:
+		//  Add support for --dns-mode (0/1/2/3), --data-dir /somewhere, --httpdocs-dir /somewhereelse,
+		//  --dump-timeline (on/off), --enable-aggregations (0/1/2), --local-networks, 
+		//  --http-port, --https-port
+		$start = "/usr/local/bin/ntopng -s -e {$ifaces} &";
 		write_rcfile(array(
-					"file" => "ntop.sh",
+					"file" => "ntopng.sh",
 					"start" => $start,
-					"stop" => "/usr/bin/killall ntop"
+					"stop" => "/usr/bin/killall ntopng"
 				)
 		);
-		if (is_service_running("ntop")) {
-			stop_service("ntop");
-			// Wait for ntop to shut down cleanly.
+		if (is_service_running("ntopng")) {
+			stop_service("ntopng");
+			// Wait for ntopng to shut down cleanly.
 			sleep(20);
 		}
-		if (empty($ntop_config['password']))
-			$ntop_config['password'] = "admin";
-		unlink_if_exists("/var/db/ntop/ntop_pw.db");
-		exec("/usr/local/bin/ntop --set-admin-password={$ntop_config['password']}");
+		if (empty($ntopng_config['password']))
+			$ntopng_config['password'] = "admin";
+		$password = md5($ntopng_config['password']);
+		exec("/usr/local/bin/redis-cli SET user.admin.password " . escapeshellarg($password));
 		sleep(2);
-		start_service("ntop");
+		start_service("ntopng");
 		conf_mount_ro();
 		config_unlock();
 	}
 	]]>
 	</custom_php_global_functions>
 	<custom_add_php_command>
-		sync_package_ntop();
+		sync_package_ntopng();
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
-		sync_package_ntop();
+		sync_package_ntopng();
 	</custom_php_resync_config_command>
 	<custom_php_install_command>
-		sync_package_ntop();
+		sync_package_ntopng();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
-		exec("rm /usr/local/etc/rc.d/ntop*");
+		exec("rm /usr/local/etc/rc.d/ntopng*");
 	</custom_php_deinstall_command>
 	<custom_php_validation_command>
 	<![CDATA[
 	if ($_POST) {
 		if (empty($_POST['password']) || empty($_POST['passwordagain']))
-			$input_errors[] = "You must provide (and confirm) ntop's password.";
+			$input_errors[] = "You must provide (and confirm) ntopng's password.";
 		if ($_POST['password'] != $_POST['passwordagain'])
 			$input_errors[] = "The provided passwords did not match.";
 	}
-- 
cgit v1.2.3


From 48fffc39f7f577106ffbfaf84e9a97c32850705f Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 12 Aug 2014 16:33:42 -0400
Subject: Fix filename

---
 config/ntopng/ntop.xml   | 173 -----------------------------------------------
 config/ntopng/ntopng.xml | 173 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+), 173 deletions(-)
 delete mode 100644 config/ntopng/ntop.xml
 create mode 100644 config/ntopng/ntopng.xml

(limited to 'config/ntopng')

diff --git a/config/ntopng/ntop.xml b/config/ntopng/ntop.xml
deleted file mode 100644
index 20582c86..00000000
--- a/config/ntopng/ntop.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
-<packagegui>
-	<copyright>
-	<![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-	ntopng.xml
-	part of pfSense (http://www.pfSense.com)
-	Copyright (C) 2014 ESF, LLC
-	All rights reserved.
-*/
-/* ========================================================================== */
-/*
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	 1. Redistributions of source code must retain the above copyright notice,
-		this list of conditions and the following disclaimer.
-
-	 2. Redistributions in binary form must reproduce the above copyright
-		notice, this list of conditions and the following disclaimer in the
-		documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-/* ========================================================================== */
-	]]>
-	</copyright>
-	<name>ntopng</name>
-	<version>1.1 v0.1</version>
-	<title>Diagnostics: ntopng Settings</title>
-	<savetext>Change</savetext>
-	<aftersaveredirect>pkg_edit.php?xml=ntopng.xml</aftersaveredirect>
-	<menu>
-		<name>ntopng Settings</name>
-		<tooltiptext>Set ntopng settings such as password and port.</tooltiptext>
-		<section>Diagnostics</section>
-		<url>/pkg_edit.php?xml=ntopng.xml&amp;id=0</url>
-	</menu>
-	<menu>
-		<name>ntopng</name>
-		<tooltiptext>Access ntopng</tooltiptext>
-		<section>Diagnostics</section>
-		<url>https://$myurl:3001</url>
-		<depends_on_service>ntopng</depends_on_service>
-	</menu>
-	<service>
-		<name>ntopng</name>
-		<rcfile>ntopng.sh</rcfile>
-		<executable>ntopng</executable>
-		<description>ntopng bandwidth monitoring/graphing</description>
-	</service>
-	<tabs>
-		<tab>
-			<text>ntopng Settings</text>
-			<url>/pkg_edit.php?xml=ntop.xml&amp;id=0</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Access ntopng</text>
-			<url>https://$myurl:3001</url>
-		</tab>
-	</tabs>
-	<fields>
-		<field>
-			<fielddescr>ntopng Admin Password</fielddescr>
-			<fieldname>password</fieldname>
-			<description>Enter the password for the ntopng GUI.  Minimum 5 characters, defaults to admin.</description>
-			<type>password</type>
-		</field>
-		<field>
-			<fielddescr>Confirm ntopng Admin Password</fielddescr>
-			<fieldname>passwordagain</fieldname>
-			<type>password</type>
-		</field>
-		<field>
-			<fielddescr>Interface</fielddescr>
-			<fieldname>interface_array</fieldname>
-			<type>interfaces_selection</type>
-			<size>3</size>
-			<value>lan</value>
-			<multiple>true</multiple>
-		</field>
-	</fields>
-	<custom_php_global_functions>
-	<![CDATA[
-	function sync_package_ntopng() {
-		conf_mount_rw();
-		config_lock();
-		global $config;
-		global $input_errors;
-		if ($_POST) {
-			$config['installedpackages']['ntopng']['config'] = array();
-			$config['installedpackages']['ntopng']['config'][0] = $_POST;
-		}
-		$ntopng_config =& $config['installedpackages']['ntopng']['config'][0];
-		$if_final = "";
-		$ifaces_final = "";
-		system("/bin/mkdir -p /var/db/ntopng");
-		system("/bin/mkdir -p /var/db/ntopng/rrd");
-		system("/bin/mkdir -p /var/db/ntopng/rrd/graphics");
-		system("/bin/chmod -R 755 /var/db/ntopng");
-		system("/usr/sbin/chown -R nobody:nobody /var/db/ntopng");
-		system("/bin/cp -Rp /usr/local/lib/X11/fonts/webfonts/ /usr/local/lib/X11/fonts/TTF/");
-		$first = 0;
-		foreach($ntopng_config['interface_array'] as $iface) {
-			$if = convert_friendly_interface_to_real_interface_name($iface);
-			if ($if) {
-				$ifaces .= " " . escapeshellarg("-i {$if}");
-			}
-		}
-		// TODO:
-		//  Add support for --dns-mode (0/1/2/3), --data-dir /somewhere, --httpdocs-dir /somewhereelse,
-		//  --dump-timeline (on/off), --enable-aggregations (0/1/2), --local-networks, 
-		//  --http-port, --https-port
-		$start = "/usr/local/bin/ntopng -s -e {$ifaces} &";
-		write_rcfile(array(
-					"file" => "ntopng.sh",
-					"start" => $start,
-					"stop" => "/usr/bin/killall ntopng"
-				)
-		);
-		if (is_service_running("ntopng")) {
-			stop_service("ntopng");
-			// Wait for ntopng to shut down cleanly.
-			sleep(20);
-		}
-		if (empty($ntopng_config['password']))
-			$ntopng_config['password'] = "admin";
-		$password = md5($ntopng_config['password']);
-		exec("/usr/local/bin/redis-cli SET user.admin.password " . escapeshellarg($password));
-		sleep(2);
-		start_service("ntopng");
-		conf_mount_ro();
-		config_unlock();
-	}
-	]]>
-	</custom_php_global_functions>
-	<custom_add_php_command>
-		sync_package_ntopng();
-	</custom_add_php_command>
-	<custom_php_resync_config_command>
-		sync_package_ntopng();
-	</custom_php_resync_config_command>
-	<custom_php_install_command>
-		sync_package_ntopng();
-	</custom_php_install_command>
-	<custom_php_deinstall_command>
-		exec("rm /usr/local/etc/rc.d/ntopng*");
-	</custom_php_deinstall_command>
-	<custom_php_validation_command>
-	<![CDATA[
-	if ($_POST) {
-		if (empty($_POST['password']) || empty($_POST['passwordagain']))
-			$input_errors[] = "You must provide (and confirm) ntopng's password.";
-		if ($_POST['password'] != $_POST['passwordagain'])
-			$input_errors[] = "The provided passwords did not match.";
-	}
-	]]>
-	</custom_php_validation_command>
-</packagegui>
\ No newline at end of file
diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml
new file mode 100644
index 00000000..20582c86
--- /dev/null
+++ b/config/ntopng/ntopng.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
+<packagegui>
+	<copyright>
+	<![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+	ntopng.xml
+	part of pfSense (http://www.pfSense.com)
+	Copyright (C) 2014 ESF, LLC
+	All rights reserved.
+*/
+/* ========================================================================== */
+/*
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	 1. Redistributions of source code must retain the above copyright notice,
+		this list of conditions and the following disclaimer.
+
+	 2. Redistributions in binary form must reproduce the above copyright
+		notice, this list of conditions and the following disclaimer in the
+		documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ========================================================================== */
+	]]>
+	</copyright>
+	<name>ntopng</name>
+	<version>1.1 v0.1</version>
+	<title>Diagnostics: ntopng Settings</title>
+	<savetext>Change</savetext>
+	<aftersaveredirect>pkg_edit.php?xml=ntopng.xml</aftersaveredirect>
+	<menu>
+		<name>ntopng Settings</name>
+		<tooltiptext>Set ntopng settings such as password and port.</tooltiptext>
+		<section>Diagnostics</section>
+		<url>/pkg_edit.php?xml=ntopng.xml&amp;id=0</url>
+	</menu>
+	<menu>
+		<name>ntopng</name>
+		<tooltiptext>Access ntopng</tooltiptext>
+		<section>Diagnostics</section>
+		<url>https://$myurl:3001</url>
+		<depends_on_service>ntopng</depends_on_service>
+	</menu>
+	<service>
+		<name>ntopng</name>
+		<rcfile>ntopng.sh</rcfile>
+		<executable>ntopng</executable>
+		<description>ntopng bandwidth monitoring/graphing</description>
+	</service>
+	<tabs>
+		<tab>
+			<text>ntopng Settings</text>
+			<url>/pkg_edit.php?xml=ntop.xml&amp;id=0</url>
+			<active/>
+		</tab>
+		<tab>
+			<text>Access ntopng</text>
+			<url>https://$myurl:3001</url>
+		</tab>
+	</tabs>
+	<fields>
+		<field>
+			<fielddescr>ntopng Admin Password</fielddescr>
+			<fieldname>password</fieldname>
+			<description>Enter the password for the ntopng GUI.  Minimum 5 characters, defaults to admin.</description>
+			<type>password</type>
+		</field>
+		<field>
+			<fielddescr>Confirm ntopng Admin Password</fielddescr>
+			<fieldname>passwordagain</fieldname>
+			<type>password</type>
+		</field>
+		<field>
+			<fielddescr>Interface</fielddescr>
+			<fieldname>interface_array</fieldname>
+			<type>interfaces_selection</type>
+			<size>3</size>
+			<value>lan</value>
+			<multiple>true</multiple>
+		</field>
+	</fields>
+	<custom_php_global_functions>
+	<![CDATA[
+	function sync_package_ntopng() {
+		conf_mount_rw();
+		config_lock();
+		global $config;
+		global $input_errors;
+		if ($_POST) {
+			$config['installedpackages']['ntopng']['config'] = array();
+			$config['installedpackages']['ntopng']['config'][0] = $_POST;
+		}
+		$ntopng_config =& $config['installedpackages']['ntopng']['config'][0];
+		$if_final = "";
+		$ifaces_final = "";
+		system("/bin/mkdir -p /var/db/ntopng");
+		system("/bin/mkdir -p /var/db/ntopng/rrd");
+		system("/bin/mkdir -p /var/db/ntopng/rrd/graphics");
+		system("/bin/chmod -R 755 /var/db/ntopng");
+		system("/usr/sbin/chown -R nobody:nobody /var/db/ntopng");
+		system("/bin/cp -Rp /usr/local/lib/X11/fonts/webfonts/ /usr/local/lib/X11/fonts/TTF/");
+		$first = 0;
+		foreach($ntopng_config['interface_array'] as $iface) {
+			$if = convert_friendly_interface_to_real_interface_name($iface);
+			if ($if) {
+				$ifaces .= " " . escapeshellarg("-i {$if}");
+			}
+		}
+		// TODO:
+		//  Add support for --dns-mode (0/1/2/3), --data-dir /somewhere, --httpdocs-dir /somewhereelse,
+		//  --dump-timeline (on/off), --enable-aggregations (0/1/2), --local-networks, 
+		//  --http-port, --https-port
+		$start = "/usr/local/bin/ntopng -s -e {$ifaces} &";
+		write_rcfile(array(
+					"file" => "ntopng.sh",
+					"start" => $start,
+					"stop" => "/usr/bin/killall ntopng"
+				)
+		);
+		if (is_service_running("ntopng")) {
+			stop_service("ntopng");
+			// Wait for ntopng to shut down cleanly.
+			sleep(20);
+		}
+		if (empty($ntopng_config['password']))
+			$ntopng_config['password'] = "admin";
+		$password = md5($ntopng_config['password']);
+		exec("/usr/local/bin/redis-cli SET user.admin.password " . escapeshellarg($password));
+		sleep(2);
+		start_service("ntopng");
+		conf_mount_ro();
+		config_unlock();
+	}
+	]]>
+	</custom_php_global_functions>
+	<custom_add_php_command>
+		sync_package_ntopng();
+	</custom_add_php_command>
+	<custom_php_resync_config_command>
+		sync_package_ntopng();
+	</custom_php_resync_config_command>
+	<custom_php_install_command>
+		sync_package_ntopng();
+	</custom_php_install_command>
+	<custom_php_deinstall_command>
+		exec("rm /usr/local/etc/rc.d/ntopng*");
+	</custom_php_deinstall_command>
+	<custom_php_validation_command>
+	<![CDATA[
+	if ($_POST) {
+		if (empty($_POST['password']) || empty($_POST['passwordagain']))
+			$input_errors[] = "You must provide (and confirm) ntopng's password.";
+		if ($_POST['password'] != $_POST['passwordagain'])
+			$input_errors[] = "The provided passwords did not match.";
+	}
+	]]>
+	</custom_php_validation_command>
+</packagegui>
\ No newline at end of file
-- 
cgit v1.2.3


From 41312d9fb1c91c02fd6ead5756f2b3a88f5b529b Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 13 Aug 2014 09:20:45 -0400
Subject: Misc refinements for ntopng

---
 config/ntopng/ntopng.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config/ntopng')

diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml
index 20582c86..ef33373d 100644
--- a/config/ntopng/ntopng.xml
+++ b/config/ntopng/ntopng.xml
@@ -155,7 +155,10 @@
 		sync_package_ntopng();
 	</custom_php_resync_config_command>
 	<custom_php_install_command>
+	<![CDATA[
+		mwexec_bg("/usr/local/bin/geoipupdate.sh");
 		sync_package_ntopng();
+	]]>
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
 		exec("rm /usr/local/etc/rc.d/ntopng*");
-- 
cgit v1.2.3


From 5e2733492aaaa8a6c124d41e7f8d66d501f4915f Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 13 Aug 2014 12:58:46 -0400
Subject: More fixes for ntopng. Once the latest binaries are all in place it
 can be activated for testing.

---
 config/ntopng/ntopng.xml | 81 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 69 insertions(+), 12 deletions(-)

(limited to 'config/ntopng')

diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml
index ef33373d..9d7544e5 100644
--- a/config/ntopng/ntopng.xml
+++ b/config/ntopng/ntopng.xml
@@ -53,7 +53,7 @@
 		<name>ntopng</name>
 		<tooltiptext>Access ntopng</tooltiptext>
 		<section>Diagnostics</section>
-		<url>https://$myurl:3001</url>
+		<url>http://$myurl:3000</url>
 		<depends_on_service>ntopng</depends_on_service>
 	</menu>
 	<service>
@@ -65,12 +65,12 @@
 	<tabs>
 		<tab>
 			<text>ntopng Settings</text>
-			<url>/pkg_edit.php?xml=ntop.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=ntopng.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
 			<text>Access ntopng</text>
-			<url>https://$myurl:3001</url>
+			<url>http://$myurl:3000</url>
 		</tab>
 	</tabs>
 	<fields>
@@ -93,6 +93,31 @@
 			<value>lan</value>
 			<multiple>true</multiple>
 		</field>
+		<field>
+			<fielddescr>DNS Mode</fielddescr>
+			<fieldname>dns_mode</fieldname>
+			<description>Configures how name resolution is handled</description>
+			<type>select</type>
+			<default_value>0</default_value>
+			<options>
+				<option><value>0</value><name>Decode DNS responses and resolve local numeric IPs only (default)</name></option>
+				<option><value>1</value><name>Decode DNS responses and resolve all numeric IPs</name></option>
+				<option><value>2</value><name>Decode DNS responses and don't resolve numeric IPs</name></option>
+				<option><value>3</value><name>Don't decode DNS responses and don't resolve numeric IPs</name></option>
+			</options>
+		</field>
+		<field>
+			<fielddescr>Local Networks</fielddescr>
+			<fieldname>local_networks</fieldname>
+			<description>Configures how Local Networks are defined</description>
+			<type>select</type>
+			<default_value>rfc1918</default_value>
+			<options>
+				<option><value>rfc1918</value><name>Consider all RFC1918 networks local</name></option>
+				<option><value>selected</value><name>Consider selected interface networks local</name></option>
+				<option><value>lanonly</value><name>Consider only LAN interface local</name></option>
+			</options>
+		</field>
 	</fields>
 	<custom_php_global_functions>
 	<![CDATA[
@@ -118,18 +143,49 @@
 		foreach($ntopng_config['interface_array'] as $iface) {
 			$if = convert_friendly_interface_to_real_interface_name($iface);
 			if ($if) {
-				$ifaces .= " " . escapeshellarg("-i {$if}");
+				$ifaces .= " -i " . escapeshellarg("{$if}");
 			}
 		}
+
+		// DNS Mode
+		if (is_numeric($ntopng_config['dns_mode']) && ($ntopng_config['dns_mode'] >= 0) && ($ntopng_config['dns_mode'] <= 3)) {
+			$dns_mode = "--dns-mode " . escapeshellarg($ntopng_config['dns_mode']);
+		}
+
+		// Local Networks >
+		switch ($ntopng_config['local_networks']) {
+			case "selected":
+				$nets = array();
+				foreach ($ntopng_config['interface_array'] as $iface) {
+					if (is_ipaddr(get_interface_ip($iface))) {
+						$nets[] = gen_subnet(get_interface_ip($iface),get_interface_subnet($iface)) . '/' . get_interface_subnet($iface);
+					}
+				}
+				if (!empty($nets))
+					$local_networks = "--local-networks " . escapeshellarg(implode(",", $nets));
+				break;
+			case "lanonly":
+				if (is_ipaddr(get_interface_ip('lan'))) {
+					$local_networks = "--local-networks " . escapeshellarg(gen_subnet(get_interface_ip('lan'),get_interface_subnet('lan')) . '/' . get_interface_subnet('lan'));
+				}
+				break;
+			case "rfc1918":
+			default:
+				$local_networks = "--local-networks '192.168.0.0/16,172.16.0.0/12,10.0.0.0/8'";
+				break;
+		}
+
+		$start = "ldconfig -m /usr/pbi/ntopng-i386/lib\n";
+		$start .= "\t/usr/pbi/ntopng-" . php_uname("m") . "/bin/redis-server &\n";
 		// TODO:
-		//  Add support for --dns-mode (0/1/2/3), --data-dir /somewhere, --httpdocs-dir /somewhereelse,
-		//  --dump-timeline (on/off), --enable-aggregations (0/1/2), --local-networks, 
-		//  --http-port, --https-port
-		$start = "/usr/local/bin/ntopng -s -e {$ifaces} &";
+		//  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} &";
 		write_rcfile(array(
 					"file" => "ntopng.sh",
 					"start" => $start,
-					"stop" => "/usr/bin/killall ntopng"
+					"stop" => "/usr/bin/killall ntopng redis-cli redis-server"
 				)
 		);
 		if (is_service_running("ntopng")) {
@@ -137,12 +193,13 @@
 			// Wait for ntopng to shut down cleanly.
 			sleep(20);
 		}
+		start_service("ntopng");
+		sleep(2);
+
 		if (empty($ntopng_config['password']))
 			$ntopng_config['password'] = "admin";
 		$password = md5($ntopng_config['password']);
-		exec("/usr/local/bin/redis-cli SET user.admin.password " . escapeshellarg($password));
-		sleep(2);
-		start_service("ntopng");
+		mwexec_bg("/usr/pbi/ntopng-" . php_uname("m") . "/bin/redis-cli SET user.admin.password " . escapeshellarg($password));
 		conf_mount_ro();
 		config_unlock();
 	}
-- 
cgit v1.2.3


From a87623c8301712663a431afa6578bcf596630dea Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 13 Aug 2014 13:03:34 -0400
Subject: Fix path to geoip update script

---
 config/ntopng/ntopng.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/ntopng')

diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml
index 9d7544e5..2ba22dd7 100644
--- a/config/ntopng/ntopng.xml
+++ b/config/ntopng/ntopng.xml
@@ -213,7 +213,7 @@
 	</custom_php_resync_config_command>
 	<custom_php_install_command>
 	<![CDATA[
-		mwexec_bg("/usr/local/bin/geoipupdate.sh");
+		mwexec_bg("/usr/pbi/ntopng-" . php_uname("m") . "/bin/geoipupdate.sh");
 		sync_package_ntopng();
 	]]>
 	</custom_php_install_command>
-- 
cgit v1.2.3


From 906e342cd9726889caec52e529cdad12022ec5d6 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 15 Aug 2014 18:49:18 -0400
Subject: Fix redis path for 2.2 (ntopng)

---
 config/ntopng/ntopng.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'config/ntopng')

diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml
index 2ba22dd7..5428d205 100644
--- a/config/ntopng/ntopng.xml
+++ b/config/ntopng/ntopng.xml
@@ -175,8 +175,15 @@
 				break;
 		}
 
+		$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";
+		} else {
+			$redis_path = "/usr/pbi/ntopng-" . php_uname("m") . "/bin";
+		}
+
 		$start = "ldconfig -m /usr/pbi/ntopng-i386/lib\n";
-		$start .= "\t/usr/pbi/ntopng-" . php_uname("m") . "/bin/redis-server &\n";
+		$start .= "\t{$redis_path}/redis-server &\n";
 		// TODO:
 		//  Add support for --data-dir /somewhere, --httpdocs-dir /somewhereelse,
 		//  --dump-timeline (on/off) --http-port, --https-port
@@ -199,7 +206,7 @@
 		if (empty($ntopng_config['password']))
 			$ntopng_config['password'] = "admin";
 		$password = md5($ntopng_config['password']);
-		mwexec_bg("/usr/pbi/ntopng-" . php_uname("m") . "/bin/redis-cli SET user.admin.password " . escapeshellarg($password));
+		mwexec_bg("{$redis_path}/redis-cli SET user.admin.password " . escapeshellarg($password));
 		conf_mount_ro();
 		config_unlock();
 	}
-- 
cgit v1.2.3