diff options
| -rw-r--r-- | config/ntopng/ntopng.xml | 32 | ||||
| -rw-r--r-- | config/zabbix-lts/zabbix-lts.inc | 16 | ||||
| -rw-r--r-- | pkg_config.10.xml | 14 |
3 files changed, 43 insertions, 19 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. */ diff --git a/config/zabbix-lts/zabbix-lts.inc b/config/zabbix-lts/zabbix-lts.inc index 450b78a1..af446261 100644 --- a/config/zabbix-lts/zabbix-lts.inc +++ b/config/zabbix-lts/zabbix-lts.inc @@ -38,6 +38,15 @@ require_once("functions.inc"); require_once("pkg-utils.inc"); require_once("globals.inc"); +$pf_version=substr(trim(file_get_contents("/etc/version")),0,3); +if ($pf_version == "2.1" || $pf_version == "2.2") { + define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); + define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); +} else { + define('ZABBIX_AGENT_BASE', '/usr/local'); + define('ZABBIX_AGENT_BASE', '/usr/local'); +} + function php_install_zabbix_lts(){ sync_package_zabbix_lts(); } @@ -47,8 +56,6 @@ function php_deinstall_zabbix_agent_lts(){ conf_mount_rw(); - define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); - exec("/usr/bin/killall zabbix_agentd"); unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix_agentd_lts.sh"); unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf"); @@ -70,8 +77,6 @@ function php_deinstall_zabbix_proxy_lts(){ conf_mount_rw(); - define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); - exec("/usr/bin/killall zabbix_proxy"); unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix_proxy_lts.sh"); unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf"); @@ -170,9 +175,6 @@ function sync_package_zabbix_lts(){ conf_mount_rw(); - define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); - define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); - #check zabbix proxy config if (is_array($config['installedpackages']['zabbixproxylts'])){ $zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0]; diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 3e46eec9..73a6a260 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -289,12 +289,14 @@ <website>http://www.ntop.org/</website> <descr>ntopng (replaces ntop) is a network probe that shows network usage in a way similar to what top does for processes. In interactive mode, it displays the network status on the user's terminal. In Web mode it acts as a Web server, creating an HTML dump of the network status. It sports a NetFlow/sFlow emitter/collector, an HTTP-based client interface for creating ntop-centric monitoring applications, and RRD for persistently storing traffic statistics.</descr> <category>Network Management</category> + <port_category>net</port_category> + <run_depends>bin/ntopng:net/ntopng bin/redis-cli:databases/redis bin/gdbmtool:databases/gdbm share/fonts/webfonts/arial.ttf:x11-fonts/webfonts bin/acyclic:graphics/graphviz</run_depends> <depends_on_package_pbi>ntopng-1.2.1-##ARCH##.pbi</depends_on_package_pbi> <build_pbi> <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.5</version> + <version>0.5</version> <status>ALPHA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/ntopng/ntopng.xml</config_file> @@ -1452,17 +1454,20 @@ </package> <package> <name>Zabbix Agent LTS</name> + <internal_name>zabbix-agent</internal_name> <descr>LTS (Long Term Support) release of Zabbix Monitoring agent. Zabbix LTS releases are supported for Zabbix customers during five (5) years i.e. 3 years of Full Support (general, critical and security issues) and 2 additional years of Limited Support (critical and security issues only). Zabbix LTS version release will result in change of the first version number. More info in http://www.zabbix.com/life_cycle_and_release_policy.php </descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-agent-lts.xml</config_file> - <version>zabbix-agent-lts-2.2.7 pkg v0.8.3</version> + <version>0.8.3</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>zabbix-agent-lts.xml</configurationfile> <maintainer>dbaio@bsd.com.br</maintainer> + <port_category>net-mgmt</port_category> + <run_depends>sbin/zabbix_agent:net-mgmt/zabbix22-agent</run_depends> <build_pbi> <custom_name>zabbix22-agent</custom_name> <port>net-mgmt/zabbix22-agent</port> @@ -1472,17 +1477,20 @@ </package> <package> <name>Zabbix Proxy LTS</name> + <internal_name>zabbix-proxy</internal_name> <descr>LTS (Long Term Support) release of Zabbix agent proxy. Zabbix LTS releases are supported for Zabbix customers during five (5) years i.e. 3 years of Full Support (general, critical and security issues) and 2 additional years of Limited Support (critical and security issues only). Zabbix LTS version release will result in change of the first version number. More info in http://www.zabbix.com/life_cycle_and_release_policy.php </descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-proxy-lts.xml</config_file> - <version>zabbix-proxy-lts-2.2.7 pkg v0.8.3</version> + <version>0.8.3</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>zabbix-proxy-lts.xml</configurationfile> <maintainer>dbaio@bsd.com.br</maintainer> + <port_category>net-mgmt</port_category> + <run_depends>sbin/zabbix_proxy:net-mgmt/zabbix22-proxy</run_depends> <build_pbi> <custom_name>zabbix22-proxy</custom_name> <port>net-mgmt/zabbix22-proxy</port> |