From 0e931059d5cf44828b0b1dd29a9102618d0ce2a1 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 15 Dec 2014 10:51:28 -0500
Subject: Misc fixes to ntopng. Explicitly set data dir, it used to default to
 /etc/dump.rdb, now defaults to cwd which is bad. Fix path given to ldconfig,
 contained a bad reference to i386 that should have been dynamic. Bump redis
 to save after setting password to ensure the db file is flushed to disk.

---
 config/ntopng/ntopng.xml | 5 +++--
 pkg_config.10.xml        | 2 +-
 pkg_config.8.xml         | 2 +-
 pkg_config.8.xml.amd64   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml
index 5428d205..45b68bdc 100644
--- a/config/ntopng/ntopng.xml
+++ b/config/ntopng/ntopng.xml
@@ -182,8 +182,8 @@
 			$redis_path = "/usr/pbi/ntopng-" . php_uname("m") . "/bin";
 		}
 
-		$start = "ldconfig -m /usr/pbi/ntopng-i386/lib\n";
-		$start .= "\t{$redis_path}/redis-server &\n";
+		$start = "ldconfig -m /usr/pbi/ntopng-" . php_uname("m") . "/lib\n";
+		$start .= "\t{$redis_path}/redis-server --dir /var/db/ntopng/ --dbfilename ntopng.rdb &\n";
 		// TODO:
 		//  Add support for --data-dir /somewhere, --httpdocs-dir /somewhereelse,
 		//  --dump-timeline (on/off) --http-port, --https-port
@@ -207,6 +207,7 @@
 			$ntopng_config['password'] = "admin";
 		$password = md5($ntopng_config['password']);
 		mwexec_bg("{$redis_path}/redis-cli SET user.admin.password " . escapeshellarg($password));
+		mwexec_bg("{$redis_path}/redis-cli save");
 		conf_mount_ro();
 		config_unlock();
 	}
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 4eddbd7f..4736c538 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -257,7 +257,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 0bb51f42..479032a0 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 0397f780..d66ebd04 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