From f223081789b9d324a3f34988150891ea0a8e2a1b Mon Sep 17 00:00:00 2001
From: "Danilo G. Baio (dbaio)" <dbaio@bsd.com.br>
Date: Thu, 14 May 2015 11:05:37 -0300
Subject: zabbix_lts - separate directories between agent and proxy

---
 config/zabbix-agent-lts/zabbix-agent-lts.inc | 362 +++++++++++++++++++++++++++
 config/zabbix-agent-lts/zabbix-agent-lts.xml | 179 +++++++++++++
 config/zabbix-lts/zabbix-agent-lts.xml       | 179 -------------
 config/zabbix-lts/zabbix-lts.inc             | 362 ---------------------------
 config/zabbix-lts/zabbix-proxy-lts.xml       | 150 -----------
 config/zabbix-proxy-lts/zabbix-proxy-lts.inc | 362 +++++++++++++++++++++++++++
 config/zabbix-proxy-lts/zabbix-proxy-lts.xml | 150 +++++++++++
 7 files changed, 1053 insertions(+), 691 deletions(-)
 create mode 100644 config/zabbix-agent-lts/zabbix-agent-lts.inc
 create mode 100644 config/zabbix-agent-lts/zabbix-agent-lts.xml
 delete mode 100644 config/zabbix-lts/zabbix-agent-lts.xml
 delete mode 100644 config/zabbix-lts/zabbix-lts.inc
 delete mode 100644 config/zabbix-lts/zabbix-proxy-lts.xml
 create mode 100644 config/zabbix-proxy-lts/zabbix-proxy-lts.inc
 create mode 100644 config/zabbix-proxy-lts/zabbix-proxy-lts.xml

diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.inc b/config/zabbix-agent-lts/zabbix-agent-lts.inc
new file mode 100644
index 00000000..af446261
--- /dev/null
+++ b/config/zabbix-agent-lts/zabbix-agent-lts.inc
@@ -0,0 +1,362 @@
+<?php
+/* $Id$ */
+/* ========================================================================== */
+/*
+    zabbix-lts.inc
+    part of the Zabbix package for pfSense
+    Copyright (C) 2013 Danilo G. Baio
+    Copyright (C) 2013 Marcello Coutinho
+
+    All rights reserved.            
+			                                                                  */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+require_once("util.inc");
+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();	
+}
+
+function php_deinstall_zabbix_agent_lts(){
+   global $config, $g;
+
+   conf_mount_rw();
+
+   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");
+   unlink_if_exists("/var/log/zabbix-lts/zabbix_agentd_lts.log");
+   unlink_if_exists("/var/run/zabbix-lts/zabbix_agentd_lts.pid");
+
+   if (!is_array($config['installedpackages']['zabbixproxylts'])){
+      if (is_dir("/var/log/zabbix-lts"))
+         exec("/bin/rm -r /var/log/zabbix-lts/");
+      if (is_dir("/var/run/zabbix-lts"))
+         exec("/bin/rm -r /var/run/zabbix-lts/");
+   }
+
+   conf_mount_ro();
+}
+
+function php_deinstall_zabbix_proxy_lts(){
+   global $config, $g;
+
+   conf_mount_rw();
+
+   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");
+   unlink_if_exists("/var/log/zabbix-lts/zabbix_proxy_lts.log");
+   unlink_if_exists("/var/run/zabbix-lts/zabbix_proxy_lts.pid");
+
+   if (!is_array($config['installedpackages']['zabbixagentlts'])){
+      if (is_dir("/var/log/zabbix-lts"))
+         exec("/bin/rm -r /var/log/zabbix-lts/");
+      if (is_dir("/var/run/zabbix-lts"))
+         exec("/bin/rm -r /var/run/zabbix-lts/");
+   }
+
+   if (is_dir("/var/db/zabbix-lts"))
+      exec("/bin/rm -r /var/db/zabbix-lts/");
+
+   conf_mount_ro();
+}
+
+function validate_input_zabbix_lts($post, &$input_errors){
+
+	if  (isset($post['proxyenabled'])){
+		if (!is_numericint($post['serverport'])) {
+      		$input_errors[]='Server Port is not numeric.'.$ServerPort;
+   			}
+	
+		if (!is_numericint($post['configfrequency'])) {
+			$input_errors[]='Config Frequency is not numeric.';
+			}
+		}
+	if  (isset($post['agentenabled'])){
+		if (!preg_match("/\w+/", $post['server'])) {
+			$input_errors[]='Server field is required.';
+			}
+		
+		if (!preg_match("/\w+/", $post['hostname'])) {
+			$input_errors[]='Hostname field is required.';
+			}
+	
+		if ($post['listenip'] != '') {
+			if (!is_ipaddr_configured($post['listenip']) && !preg_match("/(127.0.0.1|0.0.0.0)/",$post['listenip'])) {
+				$input_errors[]='Listen IP is not a configured IP address.';
+			}
+		}
+
+		if ($post['listenport'] != '') {
+			if (!preg_match("/^\d+$/", $post['listenport'])) {
+				$input_errors[]='Listen Port is not numeric.';
+			}	
+		}
+
+		if ($post['refreshactchecks'] != '') {
+			if (!preg_match("/^\d+$/", $post['refreshactchecks'])) {
+				$input_errors[]='Refresh Active Checks is not numeric.';
+			} elseif ( $post['refreshactchecks'] < 60 || $post['refreshactchecks'] > 3600 ) {
+				$input_errors[]='You must enter a valid value for \'Refresh Active Checks\'';
+			}
+		}
+
+		if ($post['timeout'] != '') {
+			if (!is_numericint($post['timeout'])) {
+				$input_errors[]='Timeout is not numeric.';
+			} elseif ( $post['timeout'] < 1 || $post['timeout'] > 30 ) {
+				$input_errors[]='You must enter a valid value for \'Timeout\'';
+			}
+		}
+	
+		if ($post['buffersend'] != '') {
+			if (!is_numericint($post['buffersend'])) {
+				$input_errors[]='Buffer Send is not numeric.';
+			} elseif ( $post['buffersend'] < 1 || $post['buffersend'] > 3600 ) {
+				$input_errors[]='You must enter a valid value for \'Buffer Send\'';
+			}
+		}
+		
+		if ($post['buffersize'] != '') {
+			if (!is_numericint($post['buffersize'])) {
+				$input_errors[]='Bufer Size is not numeric.';
+			} elseif ( $post['buffersize'] < 2 || $post['buffersize'] > 65535 ) {
+				$input_errors[]='You must enter a valid value for \'Buffer Size\'';
+			}
+		}
+		
+		if ($post['startagents'] != '') {
+			if (!is_numericint($post['startagents'])) {
+				$input_errors[]='Start Agents is not numeric.';
+			} elseif ( $post['startagents'] < 0 || $post['startagents'] > 100 ) {
+				$input_errors[]='You must enter a valid value for \'Start Agents\'';
+			}
+		}
+	}	
+}
+
+function sync_package_zabbix_lts(){
+	global $config, $g;
+
+	conf_mount_rw();
+
+	#check zabbix proxy config
+	if (is_array($config['installedpackages']['zabbixproxylts'])){
+		$zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0];
+		if ($zbproxy_config['proxyenabled']=="on"){
+			$Mode=(is_numericint($zbproxy_config['proxymode'])?$zbproxy_config['proxymode'] : 0);
+			$AdvancedParams=base64_decode($zbproxy_config['advancedparams']);
+		
+			$zbproxy_conf_file = <<< EOF
+Server={$zbproxy_config['server']}
+ServerPort={$zbproxy_config['serverport']}
+Hostname={$zbproxy_config['hostname']}
+PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid
+DBName=/var/db/zabbix-lts/proxy.db
+LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.log
+ConfigFrequency={$zbproxy_config['configfrequency']}
+FpingLocation=/usr/local/sbin/fping
+#there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin
+Fping6Location=/usr/local/sbin/fping6
+ProxyMode={$Mode}
+{$AdvancedParams}
+
+EOF;
+			file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => "")));
+		}
+	}
+	/* check zabbix agent settings*/
+	if (is_array($config['installedpackages']['zabbixagentlts'])){
+		$zbagent_config = $config['installedpackages']['zabbixagentlts']['config'][0];
+		if ($zbagent_config['agentenabled']=="on"){
+			$RefreshActChecks=(preg_match("/(\d+)/",$zbagent_config['refreshactchecks'],$matches)? $matches[1] : "120");
+			$BufferSend=(preg_match("/(\d+)/",$zbagent_config['buffersend'],$matches)? $matches[1]  : "5"  );
+			$BufferSize=(preg_match("/(\d+)/",$zbagent_config['buffersize'],$matches)? $matches[1]  : "100");
+			$StartAgents=(preg_match("/(\d+)/",$zbagent_config['startagents'],$matches)? $matches[1] :"3" );
+			$UserParams=base64_decode($zbagent_config['userparams']);
+			$ListenIp=($zbagent_config['listenip'] != ''? $zbagent_config['listenip'] : "0.0.0.0");
+			$ListenPort=($zbagent_config['listenport'] != ''? $zbagent_config['listenport'] : "10050");
+			$TimeOut=($zbagent_config['timeout'] != ''? $zbagent_config['timeout'] : "3");
+	
+			$zbagent_conf_file = <<< EOF
+Server={$zbagent_config['server']}
+ServerActive={$zbagent_config['serveractive']}
+Hostname={$zbagent_config['hostname']}
+ListenIP={$ListenIp}
+ListenPort={$ListenPort}
+RefreshActiveChecks={$RefreshActChecks}
+DebugLevel=3
+PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid
+LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log
+LogFileSize=1
+Timeout={$TimeOut}
+BufferSend={$BufferSend}
+BufferSize={$BufferSize}
+StartAgents={$StartAgents}
+{$UserParams}
+
+EOF;
+		file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf",  strtr($zbagent_conf_file, array("\r" => "")));
+		}
+	}
+	$want_sysctls = array(
+		'kern.ipc.shmall' => '2097152',
+		'kern.ipc.shmmax' => '2147483648',
+		'kern.ipc.semmsl' => '250'
+	);
+	$sysctls = array();
+	#check sysctl file values
+	$sc_file="";
+	if (file_exists("/etc/sysctl.conf")) {
+		$sc = file("/etc/sysctl.conf");
+		foreach ($sc as $line) {
+			list($sysk, $sysv) = explode("=", $line, 2);
+			if (preg_match("/\w/",$line) && !array_key_exists($sysk, $want_sysctls))
+				$sc_file.=$line;
+			}
+	}
+	foreach ($want_sysctls as $ws=> $wv) {
+		$sc_file .= "{$ws}={$wv}\n";
+		exec("/sbin/sysctl {$ws}={$wv}");
+	}
+	file_put_contents("/etc/sysctl.conf", $sc_file);
+
+	#check bootloader values
+	$lt_file="";
+	$want_tunables = array(
+		'kern.ipc.semopm' => '100',
+		'kern.ipc.semmni' => '128',
+		'kern.ipc.semmns' => '32000',
+		'kern.ipc.shmmni' => '4096'
+	);
+	$tunables = array();
+	if (file_exists("/boot/loader.conf")) {
+		$lt = file("/boot/loader.conf");
+		foreach ($lt as $line) {
+			list($tunable, $val) = explode("=", $line, 2);
+			if (preg_match("/\w/",$line) && !array_key_exists($tunable, $want_tunables))
+				$lt_file.=$line;
+		}
+	}
+	foreach ($want_tunables as $wt => $wv) {
+		$lt_file.= "{$wt}={$wv}\n";
+	}
+	file_put_contents("/boot/loader.conf", $lt_file);
+
+	/*check startup script files*/
+	/* create a few directories and ensure the sample files are in place */
+	if (!is_dir(ZABBIX_PROXY_BASE . "/etc/zabbix22"))
+		exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22");
+
+	$dir_checks  = <<< EOF
+if [ ! -d /var/log/zabbix-lts ]
+ then
+ /bin/mkdir -p /var/log/zabbix-lts
+ /usr/sbin/chmod 755 /var/log/zabbix-lts
+ fi
+/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts
+
+if [ ! -d /var/run/zabbix-lts ]
+ then
+ /bin/mkdir -p /var/run/zabbix-lts
+ /usr/sbin/chmod 755 /var/run/zabbix-lts
+ fi
+/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts
+
+if [ ! -d /var/db/zabbix-lts ]
+ then
+ /bin/mkdir -p /var/db/zabbix-lts
+ /usr/sbin/chmod 755 /var/db/zabbix-lts
+ fi
+/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts
+
+EOF;
+ 
+	$zproxy_rcfile="/usr/local/etc/rc.d/zabbix_proxy_lts.sh";
+	if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){
+		$zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy LTS\"...\n";
+		/* start zabbix proxy */
+		$zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n";
+	
+		$zproxy_stop  = "echo \"Stopping Zabbix Proxy LTS\"\n";
+		$zproxy_stop .= "/usr/bin/killall zabbix_proxy\n";
+		$zproxy_stop .= "/bin/sleep 5\n";
+
+		/* write out rc.d start/stop file */
+		write_rcfile(array(
+			"file" => "zabbix_proxy_lts.sh",
+			"start" => $zproxy_start,
+			"stop" => $zproxy_stop
+			)
+		);
+		mwexec("{$zproxy_rcfile} restart");
+	}else{
+		if (file_exists($zproxy_rcfile)){
+		mwexec("{$zproxy_rcfile} stop");
+		unlink($zproxy_rcfile);
+		}
+	}
+	
+	$zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh";
+	if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){
+		$zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n";
+		$zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n";
+	
+		$zagent_stop  = "echo \"Stopping Zabbix Agent LTS...\"\n";
+		$zagent_stop .= "/usr/bin/killall zabbix_agentd\n";
+		$zagent_stop .= "/bin/sleep 5\n";
+	
+		/* write out rc.d start/stop file */
+		write_rcfile(array(
+						"file" => "zabbix_agentd_lts.sh",
+						"start" => "$zagent_start",
+						"stop" => "$zagent_stop"
+				)
+		);
+		mwexec("{$zagent_rcfile} restart");	
+	}else{
+		if (file_exists($zagent_rcfile)){
+		mwexec("{$zagent_rcfile} stop");
+		unlink($zagent_rcfile);
+		}
+	}
+		
+	conf_mount_ro();
+}
+
+?>
diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.xml b/config/zabbix-agent-lts/zabbix-agent-lts.xml
new file mode 100644
index 00000000..b098eb62
--- /dev/null
+++ b/config/zabbix-agent-lts/zabbix-agent-lts.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packagegui>
+<copyright>
+	<![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+    zabbix-agent-lts.xml
+    part of the Zabbix package for pfSense
+    Copyright (C) 2013 Danilo G. Baio
+    Copyright (C) 2013 Marcello Coutinho
+	
+    All rights reserved.            
+			                                                                  */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+	]]>
+	</copyright>
+	<name>zabbixagentlts</name>
+	<title>Services: Zabbix Agent LTS</title>
+	<category>Monitoring</category>
+	<version>0.8.3</version>
+	<include_file>/usr/local/pkg/zabbix-lts.inc</include_file>
+	<addedit_string>Zabbix Agent LTS has been created/modified.</addedit_string>
+	<delete_string>Zabbix Agent LTS has been deleted.</delete_string>
+	<restart_command>/usr/local/etc/rc.d/zabbix_agentd_lts.sh restart</restart_command>
+	<additional_files_needed>
+		<item>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc</item>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>
+	</additional_files_needed>
+	<menu>
+		<name>Zabbix Agent LTS</name>
+		<tooltiptext>Setup Zabbix Agent specific settings</tooltiptext>
+		<section>Services</section>
+		<url>/pkg_edit.php?xml=zabbix-agent-lts.xml&amp;id=0</url>
+	</menu>
+	<service>
+		<name>zabbix_agentd_lts</name>
+		<rcfile>zabbix_agentd_lts.sh</rcfile>
+		<executable>zabbix_agentd</executable>
+		<description>Zabbix Agent LTS host monitor daemon</description>
+	</service>
+	<tabs>
+		<tab>
+			<text>Agent</text>
+			<url>/pkg_edit.php?xml=zabbix-agent-lts.xml&amp;id=0</url>
+			<active />
+		</tab>
+	</tabs>
+	<fields>
+		<field>
+			<name>Zabbix Agent LTS Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>Enable</fielddescr>
+			<fieldname>agentenabled</fieldname>
+			<description>Enable Zabbix Agent LTS service</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Server</fielddescr>
+			<fieldname>server</fieldname>
+			<description>List of comma delimited IP addresses (or hostnames) of ZABBIX servers</description>
+			<type>input</type>
+			<size>60</size>
+		</field>
+		<field>
+			<fielddescr>Server Active</fielddescr>
+			<fieldname>serveractive</fieldname>
+			<description>List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks</description>
+			<type>input</type>
+			<size>60</size>
+		</field>
+		<field>
+			<fielddescr>Hostname</fielddescr>
+			<fieldname>hostname</fieldname>
+			<description>Unique hostname. Required for active checks and must match hostname as configured on the Zabbix server (case sensitive).</description>
+			<type>input</type>
+			<size>60</size>
+		</field>
+		<field>
+			<fielddescr>Listen IP</fielddescr>
+			<fieldname>listenip</fieldname>
+			<default_value>0.0.0.0</default_value>
+			<type>input</type>
+			<size>60</size>
+			<description>Listen IP for connections from the server (default 0.0.0.0 for all interfaces)</description>
+		</field>
+		<field>
+			<fielddescr>Listen Port</fielddescr>
+			<fieldname>listenport</fieldname>
+			<default_value>10050</default_value>
+			<type>input</type>
+			<size>5</size>
+			<description>Listen port for connections from the server (default 10050)</description>
+		</field>
+		<field>
+			<fielddescr>Refresh Active Checks</fielddescr>
+			<fieldname>refreshactchecks</fieldname>
+			<default_value>120</default_value>
+			<type>input</type>
+			<size>5</size>
+			<description>The agent will refresh list of active checks once per 120 (default) seconds.</description>
+		</field>
+		<field>
+			<fielddescr>Timeout</fielddescr>
+			<fieldname>timeout</fieldname>
+			<default_value>3</default_value>
+			<type>input</type>
+			<size>5</size>
+			<description>Timeout (default 3). Do not spend more that Timeout seconds on getting requested value (1-30). The agent does not kill timeouted User Parameters processes!</description>
+		</field>
+		<field>
+			<fielddescr>Buffer Send</fielddescr>
+			<fieldname>buffersend</fieldname>
+			<default_value>5</default_value>
+			<type>input</type>
+			<size>5</size>
+			<description>Buffer Send (default 5). Do not keep data longer than N seconds in buffer (1-3600).</description>
+		</field>
+		<field>
+			<fielddescr>Buffer Size</fielddescr>
+			<fieldname>buffersize</fieldname>
+			<default_value>100</default_value>
+			<type>input</type>
+			<size>5</size>
+			<description>Buffer Size (default 100). Maximum number of values in a memory buffer (2-65535). The agent will send all collected data to Zabbix server or proxy if the buffer is full.</description>
+		</field>
+		<field>
+			<fielddescr>Start Agents</fielddescr>
+			<fieldname>startagents</fieldname>
+			<default_value>3</default_value>
+			<type>input</type>
+			<size>5</size>
+			<description>Start Agents (default 3). Number of pre-forked instances of zabbix_agentd that process passive checks (0-100).If set to 0, disables passive checks and the agent will not listen on any TCP port.</description>
+		</field>
+		<field>
+			<fielddescr>User Parameters</fielddescr>
+			<fieldname>userparams</fieldname>
+			<encoding>base64</encoding>
+			<type>textarea</type>
+			<rows>5</rows>
+			<cols>50</cols>
+			<description>User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l</description>
+		</field>
+	</fields>
+	<custom_php_install_command>sync_package_zabbix_lts();</custom_php_install_command>
+	<custom_php_command_before_form></custom_php_command_before_form>
+	<custom_php_after_head_command></custom_php_after_head_command>
+	<custom_php_after_form_command></custom_php_after_form_command>
+	<custom_php_validation_command>validate_input_zabbix_lts($_POST, $input_errors);</custom_php_validation_command>
+	<custom_add_php_command></custom_add_php_command>
+	<custom_php_resync_config_command>sync_package_zabbix_lts();</custom_php_resync_config_command>
+	<custom_php_deinstall_command>php_deinstall_zabbix_agent_lts();</custom_php_deinstall_command>
+</packagegui>
diff --git a/config/zabbix-lts/zabbix-agent-lts.xml b/config/zabbix-lts/zabbix-agent-lts.xml
deleted file mode 100644
index b098eb62..00000000
--- a/config/zabbix-lts/zabbix-agent-lts.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packagegui>
-<copyright>
-	<![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-    zabbix-agent-lts.xml
-    part of the Zabbix package for pfSense
-    Copyright (C) 2013 Danilo G. Baio
-    Copyright (C) 2013 Marcello Coutinho
-	
-    All rights reserved.            
-			                                                                  */
-/* ========================================================================== */
-/*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-	]]>
-	</copyright>
-	<name>zabbixagentlts</name>
-	<title>Services: Zabbix Agent LTS</title>
-	<category>Monitoring</category>
-	<version>0.8.3</version>
-	<include_file>/usr/local/pkg/zabbix-lts.inc</include_file>
-	<addedit_string>Zabbix Agent LTS has been created/modified.</addedit_string>
-	<delete_string>Zabbix Agent LTS has been deleted.</delete_string>
-	<restart_command>/usr/local/etc/rc.d/zabbix_agentd_lts.sh restart</restart_command>
-	<additional_files_needed>
-		<item>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc</item>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
-	<menu>
-		<name>Zabbix Agent LTS</name>
-		<tooltiptext>Setup Zabbix Agent specific settings</tooltiptext>
-		<section>Services</section>
-		<url>/pkg_edit.php?xml=zabbix-agent-lts.xml&amp;id=0</url>
-	</menu>
-	<service>
-		<name>zabbix_agentd_lts</name>
-		<rcfile>zabbix_agentd_lts.sh</rcfile>
-		<executable>zabbix_agentd</executable>
-		<description>Zabbix Agent LTS host monitor daemon</description>
-	</service>
-	<tabs>
-		<tab>
-			<text>Agent</text>
-			<url>/pkg_edit.php?xml=zabbix-agent-lts.xml&amp;id=0</url>
-			<active />
-		</tab>
-	</tabs>
-	<fields>
-		<field>
-			<name>Zabbix Agent LTS Settings</name>
-			<type>listtopic</type>
-		</field>
-		<field>
-			<fielddescr>Enable</fielddescr>
-			<fieldname>agentenabled</fieldname>
-			<description>Enable Zabbix Agent LTS service</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Server</fielddescr>
-			<fieldname>server</fieldname>
-			<description>List of comma delimited IP addresses (or hostnames) of ZABBIX servers</description>
-			<type>input</type>
-			<size>60</size>
-		</field>
-		<field>
-			<fielddescr>Server Active</fielddescr>
-			<fieldname>serveractive</fieldname>
-			<description>List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks</description>
-			<type>input</type>
-			<size>60</size>
-		</field>
-		<field>
-			<fielddescr>Hostname</fielddescr>
-			<fieldname>hostname</fieldname>
-			<description>Unique hostname. Required for active checks and must match hostname as configured on the Zabbix server (case sensitive).</description>
-			<type>input</type>
-			<size>60</size>
-		</field>
-		<field>
-			<fielddescr>Listen IP</fielddescr>
-			<fieldname>listenip</fieldname>
-			<default_value>0.0.0.0</default_value>
-			<type>input</type>
-			<size>60</size>
-			<description>Listen IP for connections from the server (default 0.0.0.0 for all interfaces)</description>
-		</field>
-		<field>
-			<fielddescr>Listen Port</fielddescr>
-			<fieldname>listenport</fieldname>
-			<default_value>10050</default_value>
-			<type>input</type>
-			<size>5</size>
-			<description>Listen port for connections from the server (default 10050)</description>
-		</field>
-		<field>
-			<fielddescr>Refresh Active Checks</fielddescr>
-			<fieldname>refreshactchecks</fieldname>
-			<default_value>120</default_value>
-			<type>input</type>
-			<size>5</size>
-			<description>The agent will refresh list of active checks once per 120 (default) seconds.</description>
-		</field>
-		<field>
-			<fielddescr>Timeout</fielddescr>
-			<fieldname>timeout</fieldname>
-			<default_value>3</default_value>
-			<type>input</type>
-			<size>5</size>
-			<description>Timeout (default 3). Do not spend more that Timeout seconds on getting requested value (1-30). The agent does not kill timeouted User Parameters processes!</description>
-		</field>
-		<field>
-			<fielddescr>Buffer Send</fielddescr>
-			<fieldname>buffersend</fieldname>
-			<default_value>5</default_value>
-			<type>input</type>
-			<size>5</size>
-			<description>Buffer Send (default 5). Do not keep data longer than N seconds in buffer (1-3600).</description>
-		</field>
-		<field>
-			<fielddescr>Buffer Size</fielddescr>
-			<fieldname>buffersize</fieldname>
-			<default_value>100</default_value>
-			<type>input</type>
-			<size>5</size>
-			<description>Buffer Size (default 100). Maximum number of values in a memory buffer (2-65535). The agent will send all collected data to Zabbix server or proxy if the buffer is full.</description>
-		</field>
-		<field>
-			<fielddescr>Start Agents</fielddescr>
-			<fieldname>startagents</fieldname>
-			<default_value>3</default_value>
-			<type>input</type>
-			<size>5</size>
-			<description>Start Agents (default 3). Number of pre-forked instances of zabbix_agentd that process passive checks (0-100).If set to 0, disables passive checks and the agent will not listen on any TCP port.</description>
-		</field>
-		<field>
-			<fielddescr>User Parameters</fielddescr>
-			<fieldname>userparams</fieldname>
-			<encoding>base64</encoding>
-			<type>textarea</type>
-			<rows>5</rows>
-			<cols>50</cols>
-			<description>User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l</description>
-		</field>
-	</fields>
-	<custom_php_install_command>sync_package_zabbix_lts();</custom_php_install_command>
-	<custom_php_command_before_form></custom_php_command_before_form>
-	<custom_php_after_head_command></custom_php_after_head_command>
-	<custom_php_after_form_command></custom_php_after_form_command>
-	<custom_php_validation_command>validate_input_zabbix_lts($_POST, $input_errors);</custom_php_validation_command>
-	<custom_add_php_command></custom_add_php_command>
-	<custom_php_resync_config_command>sync_package_zabbix_lts();</custom_php_resync_config_command>
-	<custom_php_deinstall_command>php_deinstall_zabbix_agent_lts();</custom_php_deinstall_command>
-</packagegui>
diff --git a/config/zabbix-lts/zabbix-lts.inc b/config/zabbix-lts/zabbix-lts.inc
deleted file mode 100644
index af446261..00000000
--- a/config/zabbix-lts/zabbix-lts.inc
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/* $Id$ */
-/* ========================================================================== */
-/*
-    zabbix-lts.inc
-    part of the Zabbix package for pfSense
-    Copyright (C) 2013 Danilo G. Baio
-    Copyright (C) 2013 Marcello Coutinho
-
-    All rights reserved.            
-			                                                                  */
-/* ========================================================================== */
-/*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-require_once("util.inc");
-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();	
-}
-
-function php_deinstall_zabbix_agent_lts(){
-   global $config, $g;
-
-   conf_mount_rw();
-
-   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");
-   unlink_if_exists("/var/log/zabbix-lts/zabbix_agentd_lts.log");
-   unlink_if_exists("/var/run/zabbix-lts/zabbix_agentd_lts.pid");
-
-   if (!is_array($config['installedpackages']['zabbixproxylts'])){
-      if (is_dir("/var/log/zabbix-lts"))
-         exec("/bin/rm -r /var/log/zabbix-lts/");
-      if (is_dir("/var/run/zabbix-lts"))
-         exec("/bin/rm -r /var/run/zabbix-lts/");
-   }
-
-   conf_mount_ro();
-}
-
-function php_deinstall_zabbix_proxy_lts(){
-   global $config, $g;
-
-   conf_mount_rw();
-
-   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");
-   unlink_if_exists("/var/log/zabbix-lts/zabbix_proxy_lts.log");
-   unlink_if_exists("/var/run/zabbix-lts/zabbix_proxy_lts.pid");
-
-   if (!is_array($config['installedpackages']['zabbixagentlts'])){
-      if (is_dir("/var/log/zabbix-lts"))
-         exec("/bin/rm -r /var/log/zabbix-lts/");
-      if (is_dir("/var/run/zabbix-lts"))
-         exec("/bin/rm -r /var/run/zabbix-lts/");
-   }
-
-   if (is_dir("/var/db/zabbix-lts"))
-      exec("/bin/rm -r /var/db/zabbix-lts/");
-
-   conf_mount_ro();
-}
-
-function validate_input_zabbix_lts($post, &$input_errors){
-
-	if  (isset($post['proxyenabled'])){
-		if (!is_numericint($post['serverport'])) {
-      		$input_errors[]='Server Port is not numeric.'.$ServerPort;
-   			}
-	
-		if (!is_numericint($post['configfrequency'])) {
-			$input_errors[]='Config Frequency is not numeric.';
-			}
-		}
-	if  (isset($post['agentenabled'])){
-		if (!preg_match("/\w+/", $post['server'])) {
-			$input_errors[]='Server field is required.';
-			}
-		
-		if (!preg_match("/\w+/", $post['hostname'])) {
-			$input_errors[]='Hostname field is required.';
-			}
-	
-		if ($post['listenip'] != '') {
-			if (!is_ipaddr_configured($post['listenip']) && !preg_match("/(127.0.0.1|0.0.0.0)/",$post['listenip'])) {
-				$input_errors[]='Listen IP is not a configured IP address.';
-			}
-		}
-
-		if ($post['listenport'] != '') {
-			if (!preg_match("/^\d+$/", $post['listenport'])) {
-				$input_errors[]='Listen Port is not numeric.';
-			}	
-		}
-
-		if ($post['refreshactchecks'] != '') {
-			if (!preg_match("/^\d+$/", $post['refreshactchecks'])) {
-				$input_errors[]='Refresh Active Checks is not numeric.';
-			} elseif ( $post['refreshactchecks'] < 60 || $post['refreshactchecks'] > 3600 ) {
-				$input_errors[]='You must enter a valid value for \'Refresh Active Checks\'';
-			}
-		}
-
-		if ($post['timeout'] != '') {
-			if (!is_numericint($post['timeout'])) {
-				$input_errors[]='Timeout is not numeric.';
-			} elseif ( $post['timeout'] < 1 || $post['timeout'] > 30 ) {
-				$input_errors[]='You must enter a valid value for \'Timeout\'';
-			}
-		}
-	
-		if ($post['buffersend'] != '') {
-			if (!is_numericint($post['buffersend'])) {
-				$input_errors[]='Buffer Send is not numeric.';
-			} elseif ( $post['buffersend'] < 1 || $post['buffersend'] > 3600 ) {
-				$input_errors[]='You must enter a valid value for \'Buffer Send\'';
-			}
-		}
-		
-		if ($post['buffersize'] != '') {
-			if (!is_numericint($post['buffersize'])) {
-				$input_errors[]='Bufer Size is not numeric.';
-			} elseif ( $post['buffersize'] < 2 || $post['buffersize'] > 65535 ) {
-				$input_errors[]='You must enter a valid value for \'Buffer Size\'';
-			}
-		}
-		
-		if ($post['startagents'] != '') {
-			if (!is_numericint($post['startagents'])) {
-				$input_errors[]='Start Agents is not numeric.';
-			} elseif ( $post['startagents'] < 0 || $post['startagents'] > 100 ) {
-				$input_errors[]='You must enter a valid value for \'Start Agents\'';
-			}
-		}
-	}	
-}
-
-function sync_package_zabbix_lts(){
-	global $config, $g;
-
-	conf_mount_rw();
-
-	#check zabbix proxy config
-	if (is_array($config['installedpackages']['zabbixproxylts'])){
-		$zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0];
-		if ($zbproxy_config['proxyenabled']=="on"){
-			$Mode=(is_numericint($zbproxy_config['proxymode'])?$zbproxy_config['proxymode'] : 0);
-			$AdvancedParams=base64_decode($zbproxy_config['advancedparams']);
-		
-			$zbproxy_conf_file = <<< EOF
-Server={$zbproxy_config['server']}
-ServerPort={$zbproxy_config['serverport']}
-Hostname={$zbproxy_config['hostname']}
-PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid
-DBName=/var/db/zabbix-lts/proxy.db
-LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.log
-ConfigFrequency={$zbproxy_config['configfrequency']}
-FpingLocation=/usr/local/sbin/fping
-#there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin
-Fping6Location=/usr/local/sbin/fping6
-ProxyMode={$Mode}
-{$AdvancedParams}
-
-EOF;
-			file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => "")));
-		}
-	}
-	/* check zabbix agent settings*/
-	if (is_array($config['installedpackages']['zabbixagentlts'])){
-		$zbagent_config = $config['installedpackages']['zabbixagentlts']['config'][0];
-		if ($zbagent_config['agentenabled']=="on"){
-			$RefreshActChecks=(preg_match("/(\d+)/",$zbagent_config['refreshactchecks'],$matches)? $matches[1] : "120");
-			$BufferSend=(preg_match("/(\d+)/",$zbagent_config['buffersend'],$matches)? $matches[1]  : "5"  );
-			$BufferSize=(preg_match("/(\d+)/",$zbagent_config['buffersize'],$matches)? $matches[1]  : "100");
-			$StartAgents=(preg_match("/(\d+)/",$zbagent_config['startagents'],$matches)? $matches[1] :"3" );
-			$UserParams=base64_decode($zbagent_config['userparams']);
-			$ListenIp=($zbagent_config['listenip'] != ''? $zbagent_config['listenip'] : "0.0.0.0");
-			$ListenPort=($zbagent_config['listenport'] != ''? $zbagent_config['listenport'] : "10050");
-			$TimeOut=($zbagent_config['timeout'] != ''? $zbagent_config['timeout'] : "3");
-	
-			$zbagent_conf_file = <<< EOF
-Server={$zbagent_config['server']}
-ServerActive={$zbagent_config['serveractive']}
-Hostname={$zbagent_config['hostname']}
-ListenIP={$ListenIp}
-ListenPort={$ListenPort}
-RefreshActiveChecks={$RefreshActChecks}
-DebugLevel=3
-PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid
-LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log
-LogFileSize=1
-Timeout={$TimeOut}
-BufferSend={$BufferSend}
-BufferSize={$BufferSize}
-StartAgents={$StartAgents}
-{$UserParams}
-
-EOF;
-		file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf",  strtr($zbagent_conf_file, array("\r" => "")));
-		}
-	}
-	$want_sysctls = array(
-		'kern.ipc.shmall' => '2097152',
-		'kern.ipc.shmmax' => '2147483648',
-		'kern.ipc.semmsl' => '250'
-	);
-	$sysctls = array();
-	#check sysctl file values
-	$sc_file="";
-	if (file_exists("/etc/sysctl.conf")) {
-		$sc = file("/etc/sysctl.conf");
-		foreach ($sc as $line) {
-			list($sysk, $sysv) = explode("=", $line, 2);
-			if (preg_match("/\w/",$line) && !array_key_exists($sysk, $want_sysctls))
-				$sc_file.=$line;
-			}
-	}
-	foreach ($want_sysctls as $ws=> $wv) {
-		$sc_file .= "{$ws}={$wv}\n";
-		exec("/sbin/sysctl {$ws}={$wv}");
-	}
-	file_put_contents("/etc/sysctl.conf", $sc_file);
-
-	#check bootloader values
-	$lt_file="";
-	$want_tunables = array(
-		'kern.ipc.semopm' => '100',
-		'kern.ipc.semmni' => '128',
-		'kern.ipc.semmns' => '32000',
-		'kern.ipc.shmmni' => '4096'
-	);
-	$tunables = array();
-	if (file_exists("/boot/loader.conf")) {
-		$lt = file("/boot/loader.conf");
-		foreach ($lt as $line) {
-			list($tunable, $val) = explode("=", $line, 2);
-			if (preg_match("/\w/",$line) && !array_key_exists($tunable, $want_tunables))
-				$lt_file.=$line;
-		}
-	}
-	foreach ($want_tunables as $wt => $wv) {
-		$lt_file.= "{$wt}={$wv}\n";
-	}
-	file_put_contents("/boot/loader.conf", $lt_file);
-
-	/*check startup script files*/
-	/* create a few directories and ensure the sample files are in place */
-	if (!is_dir(ZABBIX_PROXY_BASE . "/etc/zabbix22"))
-		exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22");
-
-	$dir_checks  = <<< EOF
-if [ ! -d /var/log/zabbix-lts ]
- then
- /bin/mkdir -p /var/log/zabbix-lts
- /usr/sbin/chmod 755 /var/log/zabbix-lts
- fi
-/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts
-
-if [ ! -d /var/run/zabbix-lts ]
- then
- /bin/mkdir -p /var/run/zabbix-lts
- /usr/sbin/chmod 755 /var/run/zabbix-lts
- fi
-/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts
-
-if [ ! -d /var/db/zabbix-lts ]
- then
- /bin/mkdir -p /var/db/zabbix-lts
- /usr/sbin/chmod 755 /var/db/zabbix-lts
- fi
-/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts
-
-EOF;
- 
-	$zproxy_rcfile="/usr/local/etc/rc.d/zabbix_proxy_lts.sh";
-	if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){
-		$zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy LTS\"...\n";
-		/* start zabbix proxy */
-		$zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n";
-	
-		$zproxy_stop  = "echo \"Stopping Zabbix Proxy LTS\"\n";
-		$zproxy_stop .= "/usr/bin/killall zabbix_proxy\n";
-		$zproxy_stop .= "/bin/sleep 5\n";
-
-		/* write out rc.d start/stop file */
-		write_rcfile(array(
-			"file" => "zabbix_proxy_lts.sh",
-			"start" => $zproxy_start,
-			"stop" => $zproxy_stop
-			)
-		);
-		mwexec("{$zproxy_rcfile} restart");
-	}else{
-		if (file_exists($zproxy_rcfile)){
-		mwexec("{$zproxy_rcfile} stop");
-		unlink($zproxy_rcfile);
-		}
-	}
-	
-	$zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh";
-	if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){
-		$zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n";
-		$zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n";
-	
-		$zagent_stop  = "echo \"Stopping Zabbix Agent LTS...\"\n";
-		$zagent_stop .= "/usr/bin/killall zabbix_agentd\n";
-		$zagent_stop .= "/bin/sleep 5\n";
-	
-		/* write out rc.d start/stop file */
-		write_rcfile(array(
-						"file" => "zabbix_agentd_lts.sh",
-						"start" => "$zagent_start",
-						"stop" => "$zagent_stop"
-				)
-		);
-		mwexec("{$zagent_rcfile} restart");	
-	}else{
-		if (file_exists($zagent_rcfile)){
-		mwexec("{$zagent_rcfile} stop");
-		unlink($zagent_rcfile);
-		}
-	}
-		
-	conf_mount_ro();
-}
-
-?>
diff --git a/config/zabbix-lts/zabbix-proxy-lts.xml b/config/zabbix-lts/zabbix-proxy-lts.xml
deleted file mode 100644
index de9f1e1c..00000000
--- a/config/zabbix-lts/zabbix-proxy-lts.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packagegui>
-<copyright>
-	<![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-    zabbix-proxy-lts.xml
-    part of the Zabbix package for pfSense
-    Copyright (C) 2013 Danilo G. Baio
-    Copyright (C) 2013 Marcello Coutinho
-
-    All rights reserved.            
-			                                                                  */
-/* ========================================================================== */
-/*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-	]]>
-	</copyright>
-	<name>zabbixproxylts</name>
-	<title>Services: Zabbix Proxy LTS</title>
-	<category>Monitoring</category>
-	<version>0.8.3</version>
-	<include_file>/usr/local/pkg/zabbix-lts.inc</include_file>
-	<addedit_string>Zabbix Proxy has been created/modified.</addedit_string>
-	<delete_string>Zabbix Proxy has been deleted.</delete_string>
-	<restart_command>/usr/local/etc/rc.d/zabbix_proxy_lts.sh restart</restart_command>
-	<additional_files_needed>
-		<item>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc</item>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-	</additional_files_needed>
-	<menu>
-		<name>Zabbix Proxy LTS</name>
-		<tooltiptext>Setup Zabbix Proxy LTS specific settings</tooltiptext>
-		<section>Services</section>
-		<url>/pkg_edit.php?xml=zabbix-proxy-lts.xml&amp;id=0</url>
-	</menu>
-	<service>
-		<name>zabbix_proxy_lts</name>
-		<rcfile>zabbix_proxy_lts.sh</rcfile>
-		<executable>zabbix_proxy</executable>
-		<description>Zabbix Proxy LTS collection daemon</description>
-	</service>
-	<tabs>
-		<tab>
-			<text>Proxy</text>
-			<url>/pkg_edit.php?xml=zabbix-proxy-lts.xml&amp;id=0</url>
-			<active />
-		</tab>
-	</tabs>
-	<fields>
-		<field>
-			<name>Zabbix Proxy LTS Settings</name>
-			<type>listtopic</type>
-		</field>
-		<field>
-			<fielddescr>Enable</fielddescr>
-			<fieldname>proxyenabled</fieldname>
-			<description>Enable Zabbix Proxy LTS service</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Server</fielddescr>
-			<fieldname>server</fieldname>
-			<description>List of comma delimited IP addresses (or hostnames) of ZABBIX servers</description>
-			<default_value>127.0.0.1</default_value>
-			<type>input</type>
-			<size>60</size>
-			<required>true</required>
-		</field>
-		<field>
-         <fielddescr>Server Port</fielddescr>
-         <fieldname>serverport</fieldname>
-         <description>Port of Zabbix trapper on Zabbix server. default value 10051</description>
-         <default_value>10051</default_value>
-         <type>input</type>
-         <size>6</size>
-         <required>true</required>
-		</field>
-		<field>
-			<fielddescr>Hostname</fielddescr>
-			<fieldname>hostname</fieldname>
-			<description>Unique, case-sensitive proxy name. Make sure the proxy name is known to the server</description>
-			<default_value>localhost</default_value>
-			<type>input</type>
-			<size>50</size>
-			<required>true</required>
-		</field>
-		<field>
-			<fielddescr>Proxy Mode</fielddescr>
-			<fieldname>proxymode</fieldname>
-			<description>Select Zabbix proxy mode (Active is default)</description>
-			<type>select</type>
-			<default_value>0</default_value>
-			<options>
-				<option><name>Active</name><value>0</value></option>
-				<option><name>Passive</name><value>1</value></option>
-			</options>
-			<required>true</required>
-		</field>
-		<field>
-			<fielddescr>Config Frequency</fielddescr>
-			<fieldname>configfrequency</fieldname>
-			<description>How often the proxy retrieves configuration data from the Zabbix server in seconds. Ignored if the proxy runs in passive mode.</description>
-			<default_value>3600</default_value>
-			<type>input</type>
-			<size>10</size>
-			<required>true</required>
-		</field>
-		<field>
-			<fielddescr>Advanced Parameters</fielddescr>
-			<fieldname>advancedparams</fieldname>
-			<encoding>base64</encoding>
-			<type>textarea</type>
-			<rows>5</rows>
-			<cols>50</cols>
-			<description>Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10</description>
-		</field>
-	</fields>
-	<custom_php_install_command>sync_package_zabbix_lts();</custom_php_install_command>
-	<custom_php_command_before_form></custom_php_command_before_form>
-	<custom_php_after_head_command></custom_php_after_head_command>
-	<custom_php_after_form_command></custom_php_after_form_command>
-	<custom_php_validation_command>validate_input_zabbix_lts($_POST, $input_errors);</custom_php_validation_command>
-	<custom_add_php_command></custom_add_php_command>
-	<custom_php_resync_config_command>sync_package_zabbix_lts();</custom_php_resync_config_command>
-	<custom_php_deinstall_command>php_deinstall_zabbix_proxy_lts();</custom_php_deinstall_command>
-</packagegui>
diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.inc b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc
new file mode 100644
index 00000000..af446261
--- /dev/null
+++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc
@@ -0,0 +1,362 @@
+<?php
+/* $Id$ */
+/* ========================================================================== */
+/*
+    zabbix-lts.inc
+    part of the Zabbix package for pfSense
+    Copyright (C) 2013 Danilo G. Baio
+    Copyright (C) 2013 Marcello Coutinho
+
+    All rights reserved.            
+			                                                                  */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+require_once("util.inc");
+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();	
+}
+
+function php_deinstall_zabbix_agent_lts(){
+   global $config, $g;
+
+   conf_mount_rw();
+
+   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");
+   unlink_if_exists("/var/log/zabbix-lts/zabbix_agentd_lts.log");
+   unlink_if_exists("/var/run/zabbix-lts/zabbix_agentd_lts.pid");
+
+   if (!is_array($config['installedpackages']['zabbixproxylts'])){
+      if (is_dir("/var/log/zabbix-lts"))
+         exec("/bin/rm -r /var/log/zabbix-lts/");
+      if (is_dir("/var/run/zabbix-lts"))
+         exec("/bin/rm -r /var/run/zabbix-lts/");
+   }
+
+   conf_mount_ro();
+}
+
+function php_deinstall_zabbix_proxy_lts(){
+   global $config, $g;
+
+   conf_mount_rw();
+
+   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");
+   unlink_if_exists("/var/log/zabbix-lts/zabbix_proxy_lts.log");
+   unlink_if_exists("/var/run/zabbix-lts/zabbix_proxy_lts.pid");
+
+   if (!is_array($config['installedpackages']['zabbixagentlts'])){
+      if (is_dir("/var/log/zabbix-lts"))
+         exec("/bin/rm -r /var/log/zabbix-lts/");
+      if (is_dir("/var/run/zabbix-lts"))
+         exec("/bin/rm -r /var/run/zabbix-lts/");
+   }
+
+   if (is_dir("/var/db/zabbix-lts"))
+      exec("/bin/rm -r /var/db/zabbix-lts/");
+
+   conf_mount_ro();
+}
+
+function validate_input_zabbix_lts($post, &$input_errors){
+
+	if  (isset($post['proxyenabled'])){
+		if (!is_numericint($post['serverport'])) {
+      		$input_errors[]='Server Port is not numeric.'.$ServerPort;
+   			}
+	
+		if (!is_numericint($post['configfrequency'])) {
+			$input_errors[]='Config Frequency is not numeric.';
+			}
+		}
+	if  (isset($post['agentenabled'])){
+		if (!preg_match("/\w+/", $post['server'])) {
+			$input_errors[]='Server field is required.';
+			}
+		
+		if (!preg_match("/\w+/", $post['hostname'])) {
+			$input_errors[]='Hostname field is required.';
+			}
+	
+		if ($post['listenip'] != '') {
+			if (!is_ipaddr_configured($post['listenip']) && !preg_match("/(127.0.0.1|0.0.0.0)/",$post['listenip'])) {
+				$input_errors[]='Listen IP is not a configured IP address.';
+			}
+		}
+
+		if ($post['listenport'] != '') {
+			if (!preg_match("/^\d+$/", $post['listenport'])) {
+				$input_errors[]='Listen Port is not numeric.';
+			}	
+		}
+
+		if ($post['refreshactchecks'] != '') {
+			if (!preg_match("/^\d+$/", $post['refreshactchecks'])) {
+				$input_errors[]='Refresh Active Checks is not numeric.';
+			} elseif ( $post['refreshactchecks'] < 60 || $post['refreshactchecks'] > 3600 ) {
+				$input_errors[]='You must enter a valid value for \'Refresh Active Checks\'';
+			}
+		}
+
+		if ($post['timeout'] != '') {
+			if (!is_numericint($post['timeout'])) {
+				$input_errors[]='Timeout is not numeric.';
+			} elseif ( $post['timeout'] < 1 || $post['timeout'] > 30 ) {
+				$input_errors[]='You must enter a valid value for \'Timeout\'';
+			}
+		}
+	
+		if ($post['buffersend'] != '') {
+			if (!is_numericint($post['buffersend'])) {
+				$input_errors[]='Buffer Send is not numeric.';
+			} elseif ( $post['buffersend'] < 1 || $post['buffersend'] > 3600 ) {
+				$input_errors[]='You must enter a valid value for \'Buffer Send\'';
+			}
+		}
+		
+		if ($post['buffersize'] != '') {
+			if (!is_numericint($post['buffersize'])) {
+				$input_errors[]='Bufer Size is not numeric.';
+			} elseif ( $post['buffersize'] < 2 || $post['buffersize'] > 65535 ) {
+				$input_errors[]='You must enter a valid value for \'Buffer Size\'';
+			}
+		}
+		
+		if ($post['startagents'] != '') {
+			if (!is_numericint($post['startagents'])) {
+				$input_errors[]='Start Agents is not numeric.';
+			} elseif ( $post['startagents'] < 0 || $post['startagents'] > 100 ) {
+				$input_errors[]='You must enter a valid value for \'Start Agents\'';
+			}
+		}
+	}	
+}
+
+function sync_package_zabbix_lts(){
+	global $config, $g;
+
+	conf_mount_rw();
+
+	#check zabbix proxy config
+	if (is_array($config['installedpackages']['zabbixproxylts'])){
+		$zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0];
+		if ($zbproxy_config['proxyenabled']=="on"){
+			$Mode=(is_numericint($zbproxy_config['proxymode'])?$zbproxy_config['proxymode'] : 0);
+			$AdvancedParams=base64_decode($zbproxy_config['advancedparams']);
+		
+			$zbproxy_conf_file = <<< EOF
+Server={$zbproxy_config['server']}
+ServerPort={$zbproxy_config['serverport']}
+Hostname={$zbproxy_config['hostname']}
+PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid
+DBName=/var/db/zabbix-lts/proxy.db
+LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.log
+ConfigFrequency={$zbproxy_config['configfrequency']}
+FpingLocation=/usr/local/sbin/fping
+#there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin
+Fping6Location=/usr/local/sbin/fping6
+ProxyMode={$Mode}
+{$AdvancedParams}
+
+EOF;
+			file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => "")));
+		}
+	}
+	/* check zabbix agent settings*/
+	if (is_array($config['installedpackages']['zabbixagentlts'])){
+		$zbagent_config = $config['installedpackages']['zabbixagentlts']['config'][0];
+		if ($zbagent_config['agentenabled']=="on"){
+			$RefreshActChecks=(preg_match("/(\d+)/",$zbagent_config['refreshactchecks'],$matches)? $matches[1] : "120");
+			$BufferSend=(preg_match("/(\d+)/",$zbagent_config['buffersend'],$matches)? $matches[1]  : "5"  );
+			$BufferSize=(preg_match("/(\d+)/",$zbagent_config['buffersize'],$matches)? $matches[1]  : "100");
+			$StartAgents=(preg_match("/(\d+)/",$zbagent_config['startagents'],$matches)? $matches[1] :"3" );
+			$UserParams=base64_decode($zbagent_config['userparams']);
+			$ListenIp=($zbagent_config['listenip'] != ''? $zbagent_config['listenip'] : "0.0.0.0");
+			$ListenPort=($zbagent_config['listenport'] != ''? $zbagent_config['listenport'] : "10050");
+			$TimeOut=($zbagent_config['timeout'] != ''? $zbagent_config['timeout'] : "3");
+	
+			$zbagent_conf_file = <<< EOF
+Server={$zbagent_config['server']}
+ServerActive={$zbagent_config['serveractive']}
+Hostname={$zbagent_config['hostname']}
+ListenIP={$ListenIp}
+ListenPort={$ListenPort}
+RefreshActiveChecks={$RefreshActChecks}
+DebugLevel=3
+PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid
+LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log
+LogFileSize=1
+Timeout={$TimeOut}
+BufferSend={$BufferSend}
+BufferSize={$BufferSize}
+StartAgents={$StartAgents}
+{$UserParams}
+
+EOF;
+		file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf",  strtr($zbagent_conf_file, array("\r" => "")));
+		}
+	}
+	$want_sysctls = array(
+		'kern.ipc.shmall' => '2097152',
+		'kern.ipc.shmmax' => '2147483648',
+		'kern.ipc.semmsl' => '250'
+	);
+	$sysctls = array();
+	#check sysctl file values
+	$sc_file="";
+	if (file_exists("/etc/sysctl.conf")) {
+		$sc = file("/etc/sysctl.conf");
+		foreach ($sc as $line) {
+			list($sysk, $sysv) = explode("=", $line, 2);
+			if (preg_match("/\w/",$line) && !array_key_exists($sysk, $want_sysctls))
+				$sc_file.=$line;
+			}
+	}
+	foreach ($want_sysctls as $ws=> $wv) {
+		$sc_file .= "{$ws}={$wv}\n";
+		exec("/sbin/sysctl {$ws}={$wv}");
+	}
+	file_put_contents("/etc/sysctl.conf", $sc_file);
+
+	#check bootloader values
+	$lt_file="";
+	$want_tunables = array(
+		'kern.ipc.semopm' => '100',
+		'kern.ipc.semmni' => '128',
+		'kern.ipc.semmns' => '32000',
+		'kern.ipc.shmmni' => '4096'
+	);
+	$tunables = array();
+	if (file_exists("/boot/loader.conf")) {
+		$lt = file("/boot/loader.conf");
+		foreach ($lt as $line) {
+			list($tunable, $val) = explode("=", $line, 2);
+			if (preg_match("/\w/",$line) && !array_key_exists($tunable, $want_tunables))
+				$lt_file.=$line;
+		}
+	}
+	foreach ($want_tunables as $wt => $wv) {
+		$lt_file.= "{$wt}={$wv}\n";
+	}
+	file_put_contents("/boot/loader.conf", $lt_file);
+
+	/*check startup script files*/
+	/* create a few directories and ensure the sample files are in place */
+	if (!is_dir(ZABBIX_PROXY_BASE . "/etc/zabbix22"))
+		exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22");
+
+	$dir_checks  = <<< EOF
+if [ ! -d /var/log/zabbix-lts ]
+ then
+ /bin/mkdir -p /var/log/zabbix-lts
+ /usr/sbin/chmod 755 /var/log/zabbix-lts
+ fi
+/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts
+
+if [ ! -d /var/run/zabbix-lts ]
+ then
+ /bin/mkdir -p /var/run/zabbix-lts
+ /usr/sbin/chmod 755 /var/run/zabbix-lts
+ fi
+/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts
+
+if [ ! -d /var/db/zabbix-lts ]
+ then
+ /bin/mkdir -p /var/db/zabbix-lts
+ /usr/sbin/chmod 755 /var/db/zabbix-lts
+ fi
+/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts
+
+EOF;
+ 
+	$zproxy_rcfile="/usr/local/etc/rc.d/zabbix_proxy_lts.sh";
+	if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){
+		$zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy LTS\"...\n";
+		/* start zabbix proxy */
+		$zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n";
+	
+		$zproxy_stop  = "echo \"Stopping Zabbix Proxy LTS\"\n";
+		$zproxy_stop .= "/usr/bin/killall zabbix_proxy\n";
+		$zproxy_stop .= "/bin/sleep 5\n";
+
+		/* write out rc.d start/stop file */
+		write_rcfile(array(
+			"file" => "zabbix_proxy_lts.sh",
+			"start" => $zproxy_start,
+			"stop" => $zproxy_stop
+			)
+		);
+		mwexec("{$zproxy_rcfile} restart");
+	}else{
+		if (file_exists($zproxy_rcfile)){
+		mwexec("{$zproxy_rcfile} stop");
+		unlink($zproxy_rcfile);
+		}
+	}
+	
+	$zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh";
+	if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){
+		$zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n";
+		$zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n";
+	
+		$zagent_stop  = "echo \"Stopping Zabbix Agent LTS...\"\n";
+		$zagent_stop .= "/usr/bin/killall zabbix_agentd\n";
+		$zagent_stop .= "/bin/sleep 5\n";
+	
+		/* write out rc.d start/stop file */
+		write_rcfile(array(
+						"file" => "zabbix_agentd_lts.sh",
+						"start" => "$zagent_start",
+						"stop" => "$zagent_stop"
+				)
+		);
+		mwexec("{$zagent_rcfile} restart");	
+	}else{
+		if (file_exists($zagent_rcfile)){
+		mwexec("{$zagent_rcfile} stop");
+		unlink($zagent_rcfile);
+		}
+	}
+		
+	conf_mount_ro();
+}
+
+?>
diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml
new file mode 100644
index 00000000..de9f1e1c
--- /dev/null
+++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packagegui>
+<copyright>
+	<![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+    zabbix-proxy-lts.xml
+    part of the Zabbix package for pfSense
+    Copyright (C) 2013 Danilo G. Baio
+    Copyright (C) 2013 Marcello Coutinho
+
+    All rights reserved.            
+			                                                                  */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+	]]>
+	</copyright>
+	<name>zabbixproxylts</name>
+	<title>Services: Zabbix Proxy LTS</title>
+	<category>Monitoring</category>
+	<version>0.8.3</version>
+	<include_file>/usr/local/pkg/zabbix-lts.inc</include_file>
+	<addedit_string>Zabbix Proxy has been created/modified.</addedit_string>
+	<delete_string>Zabbix Proxy has been deleted.</delete_string>
+	<restart_command>/usr/local/etc/rc.d/zabbix_proxy_lts.sh restart</restart_command>
+	<additional_files_needed>
+		<item>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc</item>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>
+	</additional_files_needed>
+	<menu>
+		<name>Zabbix Proxy LTS</name>
+		<tooltiptext>Setup Zabbix Proxy LTS specific settings</tooltiptext>
+		<section>Services</section>
+		<url>/pkg_edit.php?xml=zabbix-proxy-lts.xml&amp;id=0</url>
+	</menu>
+	<service>
+		<name>zabbix_proxy_lts</name>
+		<rcfile>zabbix_proxy_lts.sh</rcfile>
+		<executable>zabbix_proxy</executable>
+		<description>Zabbix Proxy LTS collection daemon</description>
+	</service>
+	<tabs>
+		<tab>
+			<text>Proxy</text>
+			<url>/pkg_edit.php?xml=zabbix-proxy-lts.xml&amp;id=0</url>
+			<active />
+		</tab>
+	</tabs>
+	<fields>
+		<field>
+			<name>Zabbix Proxy LTS Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>Enable</fielddescr>
+			<fieldname>proxyenabled</fieldname>
+			<description>Enable Zabbix Proxy LTS service</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Server</fielddescr>
+			<fieldname>server</fieldname>
+			<description>List of comma delimited IP addresses (or hostnames) of ZABBIX servers</description>
+			<default_value>127.0.0.1</default_value>
+			<type>input</type>
+			<size>60</size>
+			<required>true</required>
+		</field>
+		<field>
+         <fielddescr>Server Port</fielddescr>
+         <fieldname>serverport</fieldname>
+         <description>Port of Zabbix trapper on Zabbix server. default value 10051</description>
+         <default_value>10051</default_value>
+         <type>input</type>
+         <size>6</size>
+         <required>true</required>
+		</field>
+		<field>
+			<fielddescr>Hostname</fielddescr>
+			<fieldname>hostname</fieldname>
+			<description>Unique, case-sensitive proxy name. Make sure the proxy name is known to the server</description>
+			<default_value>localhost</default_value>
+			<type>input</type>
+			<size>50</size>
+			<required>true</required>
+		</field>
+		<field>
+			<fielddescr>Proxy Mode</fielddescr>
+			<fieldname>proxymode</fieldname>
+			<description>Select Zabbix proxy mode (Active is default)</description>
+			<type>select</type>
+			<default_value>0</default_value>
+			<options>
+				<option><name>Active</name><value>0</value></option>
+				<option><name>Passive</name><value>1</value></option>
+			</options>
+			<required>true</required>
+		</field>
+		<field>
+			<fielddescr>Config Frequency</fielddescr>
+			<fieldname>configfrequency</fieldname>
+			<description>How often the proxy retrieves configuration data from the Zabbix server in seconds. Ignored if the proxy runs in passive mode.</description>
+			<default_value>3600</default_value>
+			<type>input</type>
+			<size>10</size>
+			<required>true</required>
+		</field>
+		<field>
+			<fielddescr>Advanced Parameters</fielddescr>
+			<fieldname>advancedparams</fieldname>
+			<encoding>base64</encoding>
+			<type>textarea</type>
+			<rows>5</rows>
+			<cols>50</cols>
+			<description>Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10</description>
+		</field>
+	</fields>
+	<custom_php_install_command>sync_package_zabbix_lts();</custom_php_install_command>
+	<custom_php_command_before_form></custom_php_command_before_form>
+	<custom_php_after_head_command></custom_php_after_head_command>
+	<custom_php_after_form_command></custom_php_after_form_command>
+	<custom_php_validation_command>validate_input_zabbix_lts($_POST, $input_errors);</custom_php_validation_command>
+	<custom_add_php_command></custom_add_php_command>
+	<custom_php_resync_config_command>sync_package_zabbix_lts();</custom_php_resync_config_command>
+	<custom_php_deinstall_command>php_deinstall_zabbix_proxy_lts();</custom_php_deinstall_command>
+</packagegui>
-- 
cgit v1.2.3


From 20ef8140d13c5ca6bc5b32485407d0390276a9bb Mon Sep 17 00:00:00 2001
From: "Danilo G. Baio (dbaio)" <dbaio@bsd.com.br>
Date: Thu, 14 May 2015 13:03:10 -0300
Subject: zabbix_agent_lts - separate structure from old shared .inc

---
 config/zabbix-agent-lts/zabbix-agent-lts.inc | 147 +++++----------------------
 config/zabbix-agent-lts/zabbix-agent-lts.xml |  10 +-
 pkg_config.10.xml                            |   2 +-
 3 files changed, 34 insertions(+), 125 deletions(-)

diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.inc b/config/zabbix-agent-lts/zabbix-agent-lts.inc
index af446261..e3e5570c 100644
--- a/config/zabbix-agent-lts/zabbix-agent-lts.inc
+++ b/config/zabbix-agent-lts/zabbix-agent-lts.inc
@@ -2,7 +2,7 @@
 /* $Id$ */
 /* ========================================================================== */
 /*
-    zabbix-lts.inc
+    zabbix-agent-lts.inc
     part of the Zabbix package for pfSense
     Copyright (C) 2013 Danilo G. Baio
     Copyright (C) 2013 Marcello Coutinho
@@ -41,14 +41,12 @@ 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();	
+function php_install_zabbix_agent_lts(){
+	sync_package_zabbix_agent_lts();	
 }
 
 function php_deinstall_zabbix_agent_lts(){
@@ -59,62 +57,30 @@ function php_deinstall_zabbix_agent_lts(){
    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");
-   unlink_if_exists("/var/log/zabbix-lts/zabbix_agentd_lts.log");
-   unlink_if_exists("/var/run/zabbix-lts/zabbix_agentd_lts.pid");
-
-   if (!is_array($config['installedpackages']['zabbixproxylts'])){
-      if (is_dir("/var/log/zabbix-lts"))
-         exec("/bin/rm -r /var/log/zabbix-lts/");
-      if (is_dir("/var/run/zabbix-lts"))
-         exec("/bin/rm -r /var/run/zabbix-lts/");
-   }
-
-   conf_mount_ro();
-}
-
-function php_deinstall_zabbix_proxy_lts(){
-   global $config, $g;
-
-   conf_mount_rw();
+   unlink_if_exists("/var/log/zabbix-agent-lts/zabbix_agentd_lts.log");
+   unlink_if_exists("/var/run/zabbix-agent-lts/zabbix_agentd_lts.pid");
 
-   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");
-   unlink_if_exists("/var/log/zabbix-lts/zabbix_proxy_lts.log");
-   unlink_if_exists("/var/run/zabbix-lts/zabbix_proxy_lts.pid");
-
-   if (!is_array($config['installedpackages']['zabbixagentlts'])){
-      if (is_dir("/var/log/zabbix-lts"))
-         exec("/bin/rm -r /var/log/zabbix-lts/");
-      if (is_dir("/var/run/zabbix-lts"))
-         exec("/bin/rm -r /var/run/zabbix-lts/");
-   }
+	if (is_dir("/var/log/zabbix-agent-lts")) {
+		exec("/bin/rm -r /var/log/zabbix-agent-lts/");
+	}
 
-   if (is_dir("/var/db/zabbix-lts"))
-      exec("/bin/rm -r /var/db/zabbix-lts/");
+	if (is_dir("/var/run/zabbix-agent-lts")) {
+		exec("/bin/rm -r /var/run/zabbix-agent-lts/");
+	}
 
    conf_mount_ro();
 }
 
-function validate_input_zabbix_lts($post, &$input_errors){
+function validate_input_zabbix_agent_lts($post, &$input_errors){
 
-	if  (isset($post['proxyenabled'])){
-		if (!is_numericint($post['serverport'])) {
-      		$input_errors[]='Server Port is not numeric.'.$ServerPort;
-   			}
-	
-		if (!is_numericint($post['configfrequency'])) {
-			$input_errors[]='Config Frequency is not numeric.';
-			}
-		}
-	if  (isset($post['agentenabled'])){
+	if (isset($post['agentenabled'])) {
 		if (!preg_match("/\w+/", $post['server'])) {
 			$input_errors[]='Server field is required.';
-			}
+		}
 		
 		if (!preg_match("/\w+/", $post['hostname'])) {
 			$input_errors[]='Hostname field is required.';
-			}
+		}
 	
 		if ($post['listenip'] != '') {
 			if (!is_ipaddr_configured($post['listenip']) && !preg_match("/(127.0.0.1|0.0.0.0)/",$post['listenip'])) {
@@ -170,36 +136,11 @@ function validate_input_zabbix_lts($post, &$input_errors){
 	}	
 }
 
-function sync_package_zabbix_lts(){
+function sync_package_zabbix_agent_lts(){
 	global $config, $g;
 
 	conf_mount_rw();
 
-	#check zabbix proxy config
-	if (is_array($config['installedpackages']['zabbixproxylts'])){
-		$zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0];
-		if ($zbproxy_config['proxyenabled']=="on"){
-			$Mode=(is_numericint($zbproxy_config['proxymode'])?$zbproxy_config['proxymode'] : 0);
-			$AdvancedParams=base64_decode($zbproxy_config['advancedparams']);
-		
-			$zbproxy_conf_file = <<< EOF
-Server={$zbproxy_config['server']}
-ServerPort={$zbproxy_config['serverport']}
-Hostname={$zbproxy_config['hostname']}
-PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid
-DBName=/var/db/zabbix-lts/proxy.db
-LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.log
-ConfigFrequency={$zbproxy_config['configfrequency']}
-FpingLocation=/usr/local/sbin/fping
-#there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin
-Fping6Location=/usr/local/sbin/fping6
-ProxyMode={$Mode}
-{$AdvancedParams}
-
-EOF;
-			file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => "")));
-		}
-	}
 	/* check zabbix agent settings*/
 	if (is_array($config['installedpackages']['zabbixagentlts'])){
 		$zbagent_config = $config['installedpackages']['zabbixagentlts']['config'][0];
@@ -221,8 +162,8 @@ ListenIP={$ListenIp}
 ListenPort={$ListenPort}
 RefreshActiveChecks={$RefreshActChecks}
 DebugLevel=3
-PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid
-LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log
+PidFile=/var/run/zabbix-agent-lts/zabbix_agentd_lts.pid
+LogFile=/var/log/zabbix-agent-lts/zabbix_agentd_lts.log
 LogFileSize=1
 Timeout={$TimeOut}
 BufferSend={$BufferSend}
@@ -280,58 +221,26 @@ EOF;
 
 	/*check startup script files*/
 	/* create a few directories and ensure the sample files are in place */
-	if (!is_dir(ZABBIX_PROXY_BASE . "/etc/zabbix22"))
-		exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22");
+	if (!is_dir(ZABBIX_AGENT_BASE . "/etc/zabbix22"))
+		exec("/bin/mkdir -p " . ZABBIX_AGENT_BASE . "/etc/zabbix22");
 
 	$dir_checks  = <<< EOF
-if [ ! -d /var/log/zabbix-lts ]
- then
- /bin/mkdir -p /var/log/zabbix-lts
- /usr/sbin/chmod 755 /var/log/zabbix-lts
- fi
-/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts
-
-if [ ! -d /var/run/zabbix-lts ]
+if [ ! -d /var/log/zabbix-agent-lts ]
  then
- /bin/mkdir -p /var/run/zabbix-lts
- /usr/sbin/chmod 755 /var/run/zabbix-lts
+ /bin/mkdir -p /var/log/zabbix-agent-lts
+ /usr/sbin/chmod 755 /var/log/zabbix-agent-lts
  fi
-/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts
+/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-agent-lts
 
-if [ ! -d /var/db/zabbix-lts ]
+if [ ! -d /var/run/zabbix-agent-lts ]
  then
- /bin/mkdir -p /var/db/zabbix-lts
- /usr/sbin/chmod 755 /var/db/zabbix-lts
+ /bin/mkdir -p /var/run/zabbix-agent-lts
+ /usr/sbin/chmod 755 /var/run/zabbix-agent-lts
  fi
-/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts
+/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-agent-lts
 
 EOF;
  
-	$zproxy_rcfile="/usr/local/etc/rc.d/zabbix_proxy_lts.sh";
-	if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){
-		$zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy LTS\"...\n";
-		/* start zabbix proxy */
-		$zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n";
-	
-		$zproxy_stop  = "echo \"Stopping Zabbix Proxy LTS\"\n";
-		$zproxy_stop .= "/usr/bin/killall zabbix_proxy\n";
-		$zproxy_stop .= "/bin/sleep 5\n";
-
-		/* write out rc.d start/stop file */
-		write_rcfile(array(
-			"file" => "zabbix_proxy_lts.sh",
-			"start" => $zproxy_start,
-			"stop" => $zproxy_stop
-			)
-		);
-		mwexec("{$zproxy_rcfile} restart");
-	}else{
-		if (file_exists($zproxy_rcfile)){
-		mwexec("{$zproxy_rcfile} stop");
-		unlink($zproxy_rcfile);
-		}
-	}
-	
 	$zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh";
 	if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){
 		$zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n";
diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.xml b/config/zabbix-agent-lts/zabbix-agent-lts.xml
index b098eb62..d49c79db 100644
--- a/config/zabbix-agent-lts/zabbix-agent-lts.xml
+++ b/config/zabbix-agent-lts/zabbix-agent-lts.xml
@@ -42,12 +42,12 @@
 	<title>Services: Zabbix Agent LTS</title>
 	<category>Monitoring</category>
 	<version>0.8.3</version>
-	<include_file>/usr/local/pkg/zabbix-lts.inc</include_file>
+	<include_file>/usr/local/pkg/zabbix-agent-lts.inc</include_file>
 	<addedit_string>Zabbix Agent LTS has been created/modified.</addedit_string>
 	<delete_string>Zabbix Agent LTS has been deleted.</delete_string>
 	<restart_command>/usr/local/etc/rc.d/zabbix_agentd_lts.sh restart</restart_command>
 	<additional_files_needed>
-		<item>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc</item>
+		<item>https://packages.pfsense.org/packages/config/zabbix-agent-lts/zabbix-agent-lts.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
@@ -168,12 +168,12 @@
 			<description>User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l</description>
 		</field>
 	</fields>
-	<custom_php_install_command>sync_package_zabbix_lts();</custom_php_install_command>
+	<custom_php_install_command>sync_package_zabbix_agent_lts();</custom_php_install_command>
 	<custom_php_command_before_form></custom_php_command_before_form>
 	<custom_php_after_head_command></custom_php_after_head_command>
 	<custom_php_after_form_command></custom_php_after_form_command>
-	<custom_php_validation_command>validate_input_zabbix_lts($_POST, $input_errors);</custom_php_validation_command>
+	<custom_php_validation_command>validate_input_zabbix_agent_lts($_POST, $input_errors);</custom_php_validation_command>
 	<custom_add_php_command></custom_add_php_command>
-	<custom_php_resync_config_command>sync_package_zabbix_lts();</custom_php_resync_config_command>
+	<custom_php_resync_config_command>sync_package_zabbix_agent_lts();</custom_php_resync_config_command>
 	<custom_php_deinstall_command>php_deinstall_zabbix_agent_lts();</custom_php_deinstall_command>
 </packagegui>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 03fcd303..f40feac6 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1460,7 +1460,7 @@
 		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>
+		<config_file>https://packages.pfsense.org/packages/config/zabbix-agent-lts/zabbix-agent-lts.xml</config_file>
 		<version>0.8.3</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
-- 
cgit v1.2.3


From fe5d10e5125b3dbdade3daed2cd8e9443559059c Mon Sep 17 00:00:00 2001
From: "Danilo G. Baio (dbaio)" <dbaio@bsd.com.br>
Date: Thu, 14 May 2015 14:09:41 -0300
Subject: zabbix_proxy_lts - separate structure from old shared .inc

---
 config/zabbix-proxy-lts/zabbix-proxy-lts.inc | 216 +++++----------------------
 config/zabbix-proxy-lts/zabbix-proxy-lts.xml |  10 +-
 pkg_config.10.xml                            |   2 +-
 3 files changed, 47 insertions(+), 181 deletions(-)

diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.inc b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc
index af446261..3fc71a84 100644
--- a/config/zabbix-proxy-lts/zabbix-proxy-lts.inc
+++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc
@@ -2,7 +2,7 @@
 /* $Id$ */
 /* ========================================================================== */
 /*
-    zabbix-lts.inc
+    zabbix-proxy-lts.inc
     part of the Zabbix package for pfSense
     Copyright (C) 2013 Danilo G. Baio
     Copyright (C) 2013 Marcello Coutinho
@@ -40,36 +40,13 @@ 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');
+	define('ZABBIX_PROXY_BASE', '/usr/local');
 }
 
-function php_install_zabbix_lts(){
-	sync_package_zabbix_lts();	
-}
-
-function php_deinstall_zabbix_agent_lts(){
-   global $config, $g;
-
-   conf_mount_rw();
-
-   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");
-   unlink_if_exists("/var/log/zabbix-lts/zabbix_agentd_lts.log");
-   unlink_if_exists("/var/run/zabbix-lts/zabbix_agentd_lts.pid");
-
-   if (!is_array($config['installedpackages']['zabbixproxylts'])){
-      if (is_dir("/var/log/zabbix-lts"))
-         exec("/bin/rm -r /var/log/zabbix-lts/");
-      if (is_dir("/var/run/zabbix-lts"))
-         exec("/bin/rm -r /var/run/zabbix-lts/");
-   }
-
-   conf_mount_ro();
+function php_install_zabbix_proxy_lts(){
+	sync_package_zabbix_proxy_lts();	
 }
 
 function php_deinstall_zabbix_proxy_lts(){
@@ -79,98 +56,44 @@ function php_deinstall_zabbix_proxy_lts(){
 
    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");
-   unlink_if_exists("/var/log/zabbix-lts/zabbix_proxy_lts.log");
-   unlink_if_exists("/var/run/zabbix-lts/zabbix_proxy_lts.pid");
-
-   if (!is_array($config['installedpackages']['zabbixagentlts'])){
-      if (is_dir("/var/log/zabbix-lts"))
-         exec("/bin/rm -r /var/log/zabbix-lts/");
-      if (is_dir("/var/run/zabbix-lts"))
-         exec("/bin/rm -r /var/run/zabbix-lts/");
-   }
+   unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy_lts.conf");
+   unlink_if_exists("/var/log/zabbix-proxy-lts/zabbix_proxy_lts.log");
+   unlink_if_exists("/var/run/zabbix-proxy-lts/zabbix_proxy_lts.pid");
 
-   if (is_dir("/var/db/zabbix-lts"))
-      exec("/bin/rm -r /var/db/zabbix-lts/");
+	if (is_dir("/var/log/zabbix-proxy-lts")) {
+		exec("/bin/rm -r /var/log/zabbix-proxy-lts/");
+	}
+	if (is_dir("/var/run/zabbix-proxy-lts")) {
+		exec("/bin/rm -r /var/run/zabbix-proxy-lts/");
+	}
+   if (is_dir("/var/db/zabbix-proxy-lts")) {
+		exec("/bin/rm -r /var/db/zabbix-proxy-lts/");
+	}
 
    conf_mount_ro();
 }
 
-function validate_input_zabbix_lts($post, &$input_errors){
-
-	if  (isset($post['proxyenabled'])){
-		if (!is_numericint($post['serverport'])) {
-      		$input_errors[]='Server Port is not numeric.'.$ServerPort;
-   			}
-	
-		if (!is_numericint($post['configfrequency'])) {
-			$input_errors[]='Config Frequency is not numeric.';
-			}
-		}
-	if  (isset($post['agentenabled'])){
+function validate_input_zabbix_proxy_lts($post, &$input_errors){
+	if  (isset($post['proxyenabled'])) {
 		if (!preg_match("/\w+/", $post['server'])) {
 			$input_errors[]='Server field is required.';
-			}
-		
-		if (!preg_match("/\w+/", $post['hostname'])) {
-			$input_errors[]='Hostname field is required.';
-			}
-	
-		if ($post['listenip'] != '') {
-			if (!is_ipaddr_configured($post['listenip']) && !preg_match("/(127.0.0.1|0.0.0.0)/",$post['listenip'])) {
-				$input_errors[]='Listen IP is not a configured IP address.';
-			}
 		}
 
-		if ($post['listenport'] != '') {
-			if (!preg_match("/^\d+$/", $post['listenport'])) {
-				$input_errors[]='Listen Port is not numeric.';
-			}	
+		if (!is_numericint($post['serverport'])) {
+			$input_errors[]='Server Port is not numeric.'.$ServerPort;
 		}
 
-		if ($post['refreshactchecks'] != '') {
-			if (!preg_match("/^\d+$/", $post['refreshactchecks'])) {
-				$input_errors[]='Refresh Active Checks is not numeric.';
-			} elseif ( $post['refreshactchecks'] < 60 || $post['refreshactchecks'] > 3600 ) {
-				$input_errors[]='You must enter a valid value for \'Refresh Active Checks\'';
-			}
+		if (!preg_match("/\w+/", $post['hostname'])) {
+			$input_errors[]='Hostname field is required.';
 		}
 
-		if ($post['timeout'] != '') {
-			if (!is_numericint($post['timeout'])) {
-				$input_errors[]='Timeout is not numeric.';
-			} elseif ( $post['timeout'] < 1 || $post['timeout'] > 30 ) {
-				$input_errors[]='You must enter a valid value for \'Timeout\'';
-			}
-		}
-	
-		if ($post['buffersend'] != '') {
-			if (!is_numericint($post['buffersend'])) {
-				$input_errors[]='Buffer Send is not numeric.';
-			} elseif ( $post['buffersend'] < 1 || $post['buffersend'] > 3600 ) {
-				$input_errors[]='You must enter a valid value for \'Buffer Send\'';
-			}
-		}
-		
-		if ($post['buffersize'] != '') {
-			if (!is_numericint($post['buffersize'])) {
-				$input_errors[]='Bufer Size is not numeric.';
-			} elseif ( $post['buffersize'] < 2 || $post['buffersize'] > 65535 ) {
-				$input_errors[]='You must enter a valid value for \'Buffer Size\'';
-			}
-		}
-		
-		if ($post['startagents'] != '') {
-			if (!is_numericint($post['startagents'])) {
-				$input_errors[]='Start Agents is not numeric.';
-			} elseif ( $post['startagents'] < 0 || $post['startagents'] > 100 ) {
-				$input_errors[]='You must enter a valid value for \'Start Agents\'';
-			}
+		if (!is_numericint($post['configfrequency'])) {
+			$input_errors[]='Config Frequency is not numeric.';
 		}
-	}	
+	}
 }
 
-function sync_package_zabbix_lts(){
+function sync_package_zabbix_proxy_lts(){
 	global $config, $g;
 
 	conf_mount_rw();
@@ -186,9 +109,9 @@ function sync_package_zabbix_lts(){
 Server={$zbproxy_config['server']}
 ServerPort={$zbproxy_config['serverport']}
 Hostname={$zbproxy_config['hostname']}
-PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid
-DBName=/var/db/zabbix-lts/proxy.db
-LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.log
+PidFile=/var/run/zabbix-proxy-lts/zabbix_proxy_lts.pid
+DBName=/var/db/zabbix-proxy-lts/proxy.db
+LogFile=/var/log/zabbix-proxy-lts/zabbix_proxy_lts.log
 ConfigFrequency={$zbproxy_config['configfrequency']}
 FpingLocation=/usr/local/sbin/fping
 #there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin
@@ -200,40 +123,7 @@ EOF;
 			file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => "")));
 		}
 	}
-	/* check zabbix agent settings*/
-	if (is_array($config['installedpackages']['zabbixagentlts'])){
-		$zbagent_config = $config['installedpackages']['zabbixagentlts']['config'][0];
-		if ($zbagent_config['agentenabled']=="on"){
-			$RefreshActChecks=(preg_match("/(\d+)/",$zbagent_config['refreshactchecks'],$matches)? $matches[1] : "120");
-			$BufferSend=(preg_match("/(\d+)/",$zbagent_config['buffersend'],$matches)? $matches[1]  : "5"  );
-			$BufferSize=(preg_match("/(\d+)/",$zbagent_config['buffersize'],$matches)? $matches[1]  : "100");
-			$StartAgents=(preg_match("/(\d+)/",$zbagent_config['startagents'],$matches)? $matches[1] :"3" );
-			$UserParams=base64_decode($zbagent_config['userparams']);
-			$ListenIp=($zbagent_config['listenip'] != ''? $zbagent_config['listenip'] : "0.0.0.0");
-			$ListenPort=($zbagent_config['listenport'] != ''? $zbagent_config['listenport'] : "10050");
-			$TimeOut=($zbagent_config['timeout'] != ''? $zbagent_config['timeout'] : "3");
-	
-			$zbagent_conf_file = <<< EOF
-Server={$zbagent_config['server']}
-ServerActive={$zbagent_config['serveractive']}
-Hostname={$zbagent_config['hostname']}
-ListenIP={$ListenIp}
-ListenPort={$ListenPort}
-RefreshActiveChecks={$RefreshActChecks}
-DebugLevel=3
-PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid
-LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log
-LogFileSize=1
-Timeout={$TimeOut}
-BufferSend={$BufferSend}
-BufferSize={$BufferSize}
-StartAgents={$StartAgents}
-{$UserParams}
 
-EOF;
-		file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf",  strtr($zbagent_conf_file, array("\r" => "")));
-		}
-	}
 	$want_sysctls = array(
 		'kern.ipc.shmall' => '2097152',
 		'kern.ipc.shmmax' => '2147483648',
@@ -284,26 +174,26 @@ EOF;
 		exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22");
 
 	$dir_checks  = <<< EOF
-if [ ! -d /var/log/zabbix-lts ]
+if [ ! -d /var/log/zabbix-proxy-lts ]
  then
- /bin/mkdir -p /var/log/zabbix-lts
- /usr/sbin/chmod 755 /var/log/zabbix-lts
+ /bin/mkdir -p /var/log/zabbix-proxy-lts
+ /usr/sbin/chmod 755 /var/log/zabbix-proxy-lts
  fi
-/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts
+/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-proxy-lts
 
-if [ ! -d /var/run/zabbix-lts ]
+if [ ! -d /var/run/zabbix-proxy-lts ]
  then
- /bin/mkdir -p /var/run/zabbix-lts
- /usr/sbin/chmod 755 /var/run/zabbix-lts
+ /bin/mkdir -p /var/run/zabbix-proxy-lts
+ /usr/sbin/chmod 755 /var/run/zabbix-proxy-lts
  fi
-/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts
+/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-proxy-lts
 
-if [ ! -d /var/db/zabbix-lts ]
+if [ ! -d /var/db/zabbix-proxy-lts ]
  then
- /bin/mkdir -p /var/db/zabbix-lts
- /usr/sbin/chmod 755 /var/db/zabbix-lts
+ /bin/mkdir -p /var/db/zabbix-proxy-lts
+ /usr/sbin/chmod 755 /var/db/zabbix-proxy-lts
  fi
-/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts
+/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-proxy-lts
 
 EOF;
  
@@ -332,30 +222,6 @@ EOF;
 		}
 	}
 	
-	$zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh";
-	if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){
-		$zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n";
-		$zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n";
-	
-		$zagent_stop  = "echo \"Stopping Zabbix Agent LTS...\"\n";
-		$zagent_stop .= "/usr/bin/killall zabbix_agentd\n";
-		$zagent_stop .= "/bin/sleep 5\n";
-	
-		/* write out rc.d start/stop file */
-		write_rcfile(array(
-						"file" => "zabbix_agentd_lts.sh",
-						"start" => "$zagent_start",
-						"stop" => "$zagent_stop"
-				)
-		);
-		mwexec("{$zagent_rcfile} restart");	
-	}else{
-		if (file_exists($zagent_rcfile)){
-		mwexec("{$zagent_rcfile} stop");
-		unlink($zagent_rcfile);
-		}
-	}
-		
 	conf_mount_ro();
 }
 
diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml
index de9f1e1c..5454cf6d 100644
--- a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml
+++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml
@@ -42,12 +42,12 @@
 	<title>Services: Zabbix Proxy LTS</title>
 	<category>Monitoring</category>
 	<version>0.8.3</version>
-	<include_file>/usr/local/pkg/zabbix-lts.inc</include_file>
+	<include_file>/usr/local/pkg/zabbix-proxy-lts.inc</include_file>
 	<addedit_string>Zabbix Proxy has been created/modified.</addedit_string>
 	<delete_string>Zabbix Proxy has been deleted.</delete_string>
 	<restart_command>/usr/local/etc/rc.d/zabbix_proxy_lts.sh restart</restart_command>
 	<additional_files_needed>
-		<item>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc</item>
+		<item>https://packages.pfsense.org/packages/config/zabbix-proxy-lts/zabbix-proxy-lts.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
@@ -139,12 +139,12 @@
 			<description>Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10</description>
 		</field>
 	</fields>
-	<custom_php_install_command>sync_package_zabbix_lts();</custom_php_install_command>
+	<custom_php_install_command>sync_package_zabbix_proxy_lts();</custom_php_install_command>
 	<custom_php_command_before_form></custom_php_command_before_form>
 	<custom_php_after_head_command></custom_php_after_head_command>
 	<custom_php_after_form_command></custom_php_after_form_command>
-	<custom_php_validation_command>validate_input_zabbix_lts($_POST, $input_errors);</custom_php_validation_command>
+	<custom_php_validation_command>validate_input_zabbix_proxy_lts($_POST, $input_errors);</custom_php_validation_command>
 	<custom_add_php_command></custom_add_php_command>
-	<custom_php_resync_config_command>sync_package_zabbix_lts();</custom_php_resync_config_command>
+	<custom_php_resync_config_command>sync_package_zabbix_proxy_lts();</custom_php_resync_config_command>
 	<custom_php_deinstall_command>php_deinstall_zabbix_proxy_lts();</custom_php_deinstall_command>
 </packagegui>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index f40feac6..63c0f7f9 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1483,7 +1483,7 @@
 		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>
+		<config_file>https://packages.pfsense.org/packages/config/zabbix-proxy-lts/zabbix-proxy-lts.xml</config_file>
 		<version>0.8.3</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
-- 
cgit v1.2.3


From 1e06b33de75c9445463e23fa3d858ca9d2bcb415 Mon Sep 17 00:00:00 2001
From: "Danilo G. Baio (dbaio)" <dbaio@bsd.com.br>
Date: Thu, 14 May 2015 16:17:51 -0300
Subject: zabbix_lts - bump version

---
 config/zabbix-agent-lts/zabbix-agent-lts.xml | 2 +-
 config/zabbix-proxy-lts/zabbix-proxy-lts.xml | 2 +-
 pkg_config.10.xml                            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.xml b/config/zabbix-agent-lts/zabbix-agent-lts.xml
index d49c79db..b24e2aa2 100644
--- a/config/zabbix-agent-lts/zabbix-agent-lts.xml
+++ b/config/zabbix-agent-lts/zabbix-agent-lts.xml
@@ -41,7 +41,7 @@
 	<name>zabbixagentlts</name>
 	<title>Services: Zabbix Agent LTS</title>
 	<category>Monitoring</category>
-	<version>0.8.3</version>
+	<version>0.8.4</version>
 	<include_file>/usr/local/pkg/zabbix-agent-lts.inc</include_file>
 	<addedit_string>Zabbix Agent LTS has been created/modified.</addedit_string>
 	<delete_string>Zabbix Agent LTS has been deleted.</delete_string>
diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml
index 5454cf6d..089ccb0a 100644
--- a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml
+++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml
@@ -41,7 +41,7 @@
 	<name>zabbixproxylts</name>
 	<title>Services: Zabbix Proxy LTS</title>
 	<category>Monitoring</category>
-	<version>0.8.3</version>
+	<version>0.8.4</version>
 	<include_file>/usr/local/pkg/zabbix-proxy-lts.inc</include_file>
 	<addedit_string>Zabbix Proxy has been created/modified.</addedit_string>
 	<delete_string>Zabbix Proxy has been deleted.</delete_string>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 63c0f7f9..a01eccf8 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1461,7 +1461,7 @@
 		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-agent-lts/zabbix-agent-lts.xml</config_file>
-		<version>0.8.3</version>
+		<version>0.8.4</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<configurationfile>zabbix-agent-lts.xml</configurationfile>
@@ -1484,7 +1484,7 @@
 		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-proxy-lts/zabbix-proxy-lts.xml</config_file>
-		<version>0.8.3</version>
+		<version>0.8.4</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<configurationfile>zabbix-proxy-lts.xml</configurationfile>
-- 
cgit v1.2.3