diff options
| author | jim-p <jimp@pfsense.org> | 2014-08-15 18:49:18 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-08-15 18:49:18 -0400 |
| commit | 906e342cd9726889caec52e529cdad12022ec5d6 (patch) | |
| tree | ff1f26f2b8f9f815bd5a6fc9922f1f249b050d5a | |
| parent | 6863a1edad9d683380bb36510f5e7565a61d3555 (diff) | |
| download | pfsense-packages-906e342cd9726889caec52e529cdad12022ec5d6.tar.gz pfsense-packages-906e342cd9726889caec52e529cdad12022ec5d6.tar.bz2 pfsense-packages-906e342cd9726889caec52e529cdad12022ec5d6.zip | |
Fix redis path for 2.2 (ntopng)
| -rw-r--r-- | config/ntopng/ntopng.xml | 11 | ||||
| -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, 12 insertions, 5 deletions
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(); } diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 83ed26b8..971cf336 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -278,7 +278,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.1</version> + <version>1.1 v0.2</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 857fb400..7e3b0be6 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -377,7 +377,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.1</version> + <version>1.1 v0.2</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 d7917e5f..98141cd4 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -364,7 +364,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.1</version> + <version>1.1 v0.2</version> <status>ALPHA</status> <required_version>2.1.4</required_version> <config_file>https://packages.pfsense.org/packages/config/ntopng/ntopng.xml</config_file> |