From 9a51fcf39c54bc3d5a79ca229959e9b1d17daf29 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 16 Sep 2015 14:45:22 +0200 Subject: Make $ntopng_config global in ntopng_sync_package() Might fix the service restart after package reinstall. --- config/ntopng/ntopng.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ntopng/ntopng.inc b/config/ntopng/ntopng.inc index 27b484c1..55553241 100644 --- a/config/ntopng/ntopng.inc +++ b/config/ntopng/ntopng.inc @@ -89,7 +89,7 @@ function ntopng_sync_package() { return; } - global $g, $config, $pf_version; + global $g, $config, $pf_version, $ntopng_config; $pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3); $ifaces = ""; -- cgit v1.2.3 From 2879930fe78a561b77161aee658f55d112e35f7b Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 16 Sep 2015 14:47:16 +0200 Subject: Bump ntopng package version --- pkg_config.10.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index bf6a4a44..1c42f5ad 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -299,8 +299,8 @@ databases/redis databases/gdbm net/GeoIP x11-fonts/font-util x11-fonts/webfonts graphics/graphviz net/ntopng - 0.8.0 - ALPHA + 0.8.1 + BETA 2.2 https://packages.pfsense.org/packages/config/ntopng/ntopng.xml ntopng.xml -- cgit v1.2.3 From 21628dc3c7df7dbd1eb2709c988a965137143cbc Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 16 Sep 2015 14:48:16 +0200 Subject: Bump ntopng package version --- pkg_config.8.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 382155a8..74bb0332 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -368,8 +368,8 @@ databases/redis databases/gdbm net/GeoIP x11-fonts/font-util x11-fonts/webfonts graphics/graphviz net/ntopng - 1.1 v0.8.0 - ALPHA + 1.1 v0.8.1 + BETA 2.1.4 https://packages.pfsense.org/packages/config/ntopng/ntopng.xml ntopng.xml -- cgit v1.2.3 From 08fed6ad248ad6961dc5a3bc97589a737f07b718 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 16 Sep 2015 14:49:18 +0200 Subject: Bump ntopng package version --- pkg_config.8.xml.amd64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 88608bff..50355182 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -355,8 +355,8 @@ databases/redis databases/gdbm net/GeoIP x11-fonts/font-util x11-fonts/webfonts graphics/graphviz net/ntopng - 1.1 v0.8.0 - ALPHA + 1.1 v0.8.1 + BETA 2.1.4 https://packages.pfsense.org/packages/config/ntopng/ntopng.xml ntopng.xml -- cgit v1.2.3 From 3221116df2a569884ffadda1e69638c2dc55da43 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 16 Sep 2015 22:50:19 +0200 Subject: ntopng - fix up 2.1.x vs. 2.2.x PBI mess Argh! I hate the PBI thing with passion! Die! --- config/ntopng/ntopng.inc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/config/ntopng/ntopng.inc b/config/ntopng/ntopng.inc index 55553241..73db1ab0 100644 --- a/config/ntopng/ntopng.inc +++ b/config/ntopng/ntopng.inc @@ -151,8 +151,10 @@ function ntopng_sync_package() { $start = ""; $stop = ""; - if ($pf_version == "2.1" || $pf_version == "2.2") { - $start .= "ldconfig -m /usr/pbi/ntopng-" . php_uname("m") . "/lib\n"; + if ($pf_version == "2.2") { + $start .= "/sbin/ldconfig -m /usr/pbi/ntopng-" . php_uname("m") . "/local/lib\n"; + } elseif ($pf_version == "2.1") { + $start .= "/sbin/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: @@ -206,7 +208,9 @@ function ntopng_redis_started() { $redis_path = "/usr/local/bin"; } if (!is_process_running("redis-server")) { - if ($pf_version == "2.1" || $pf_version == "2.2") { + if ($pf_version == "2.2") { + mwexec("/sbin/ldconfig -m /usr/pbi/ntopng-" . php_uname("m") . "/local/lib"); + } elseif ($pf_version == "2.1") { mwexec("/sbin/ldconfig -m /usr/pbi/ntopng-" . php_uname("m") . "/lib"); } mwexec_bg("{$redis_path}/redis-server --dir /var/db/ntopng/ --dbfilename ntopng.rdb"); @@ -260,7 +264,9 @@ function ntopng_update_geoip() { $geoip_asnum = "https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz"; $geoip_asnum_v6 = "https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz"; $pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3); - if ($pf_version == "2.1" || $pf_version == "2.2") { + if ($pf_version == "2.2") { + $output_dir = "/usr/pbi/ntopng-" . php_uname("m") . "/local/share/ntopng"; + } elseif ($pf_version == "2.1") { $output_dir = "/usr/pbi/ntopng-" . php_uname("m") . "/share/ntopng"; } else { $output_dir = "/usr/local/share/ntopng"; @@ -285,8 +291,11 @@ function ntopng_update_geoip() { function ntopng_fixup_geoip() { $pf_version = substr(trim(file_get_contents("/etc/version")), 0, 3); - if ($pf_version == "2.1" || $pf_version == "2.2") { + if ($pf_version == "2.2") { $target_dir = "/usr/pbi/ntopng-" . php_uname("m") . "/local/share/ntopng/httpdocs/geoip"; + $source_dir = "/usr/pbi/ntopng-" . php_uname("m") . "/local/share/ntopng"; + } elseif ($pf_version == "2.1") { + $target_dir = "/usr/pbi/ntopng-" . php_uname("m") . "/share/ntopng/httpdocs/geoip"; $source_dir = "/usr/pbi/ntopng-" . php_uname("m") . "/share/ntopng"; } else { $target_dir = "/usr/local/share/ntopng/httpdocs/geoip"; -- cgit v1.2.3