diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-05-14 09:13:59 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-05-14 09:13:59 -0300 |
| commit | 0c9a566a742e665ddfb856e6ac7b33596871525c (patch) | |
| tree | 9561cf1d7c0031aac7e06e188a06e55727db4bf5 /config/ntopng | |
| parent | 84c5b257c048ce3a56eab993a7654e6f2dbac159 (diff) | |
| download | pfsense-packages-0c9a566a742e665ddfb856e6ac7b33596871525c.tar.gz pfsense-packages-0c9a566a742e665ddfb856e6ac7b33596871525c.tar.bz2 pfsense-packages-0c9a566a742e665ddfb856e6ac7b33596871525c.zip | |
Sanitize ntopng version, add depends, category and fix pbi detection for 2.3
Diffstat (limited to 'config/ntopng')
| -rw-r--r-- | config/ntopng/ntopng.xml | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/config/ntopng/ntopng.xml b/config/ntopng/ntopng.xml index 9382912a..2bb957b4 100644 --- a/config/ntopng/ntopng.xml +++ b/config/ntopng/ntopng.xml @@ -153,9 +153,7 @@ $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"); + mkdir("/var/db/ntopng/rrd/graphics", 0755, true); 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/"); @@ -206,13 +204,18 @@ } $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); - if ($pf_version >= 2.2) { + if ($pf_version == "2.2") { $redis_path = "/usr/pbi/ntopng-" . php_uname("m") . "/local/bin"; - } else { + } else if ($pf_version == "2.1") { $redis_path = "/usr/pbi/ntopng-" . php_uname("m") . "/bin"; + } else { + $redis_path = "/usr/local/bin"; } - $start = "ldconfig -m /usr/pbi/ntopng-" . php_uname("m") . "/lib\n"; + $start = ""; + if ($pf_version == "2.1" || $pf_version == "2.2") { + $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, @@ -243,13 +246,24 @@ config_unlock(); } function ntopng_update_geoip() { - mwexec("/usr/pbi/ntopng-" . php_uname("m") . "/bin/ntopng-geoipupdate.sh"); + $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); + if ($pf_version == "2.1" || $pf_version == "2.2") { + mwexec("/usr/pbi/ntopng-" . php_uname("m") . "/bin/ntopng-geoipupdate.sh"); + } else { + mwexec("/usr/local/bin/ntopng-geoipupdate.sh"); + } ntopng_fixup_geoip(); restart_service("ntopng"); } function ntopng_fixup_geoip() { - $target_dir = "/usr/pbi/ntopng-" . php_uname("m") . "/local/share/ntopng/httpdocs/geoip"; - $source_dir = "/usr/pbi/ntopng-" . php_uname("m") . "/share/ntopng"; + $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); + if ($pf_version == "2.1" || $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") . "/share/ntopng"; + } else { + $target_dir = "/usr/local/share/ntopng/httpdocs/geoip"; + $source_dir = "/usr/local/share/ntopng"; + } foreach(glob("{$source_dir}/Geo*.dat*") as $geofile) { /* Decompress if needed. */ |