From a67b748e2428950343488085c4a60021d83a43d5 Mon Sep 17 00:00:00 2001
From: marcelloc <marcellocoutinho@gmail.com>
Date: Mon, 11 Feb 2013 01:36:16 -0200
Subject: zabbix2 - split xml into xml and inc file. Use same inc dir and file
 for zabbix agent and client as both scripts are very similar

---
 config/zabbix2-agent/zabbix2-agent.xml | 336 --------------------------------
 config/zabbix2-proxy/zabbix2-proxy.xml | 273 --------------------------
 config/zabbix2/zabbix2-agent.xml       | 183 ++++++++++++++++++
 config/zabbix2/zabbix2-proxy.xml       | 141 ++++++++++++++
 config/zabbix2/zabbix2.inc             | 340 +++++++++++++++++++++++++++++++++
 pkg_config.8.xml                       |   8 +-
 pkg_config.8.xml.amd64                 |   4 +-
 7 files changed, 670 insertions(+), 615 deletions(-)
 delete mode 100644 config/zabbix2-agent/zabbix2-agent.xml
 delete mode 100644 config/zabbix2-proxy/zabbix2-proxy.xml
 create mode 100644 config/zabbix2/zabbix2-agent.xml
 create mode 100644 config/zabbix2/zabbix2-proxy.xml
 create mode 100644 config/zabbix2/zabbix2.inc

diff --git a/config/zabbix2-agent/zabbix2-agent.xml b/config/zabbix2-agent/zabbix2-agent.xml
deleted file mode 100644
index cadc9ed8..00000000
--- a/config/zabbix2-agent/zabbix2-agent.xml
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packagegui>
-	<name>zabbixagent</name>
-	<title>Services: Zabbix-2 Agent</title>
-	<category>Monitoring</category>
-	<version>0.6</version>
-	<addedit_string>Zabbix Agent has been created/modified.</addedit_string>
-	<delete_string>Zabbix Agent has been deleted.</delete_string>
-	<restart_command>/usr/local/etc/rc.d/zabbix2_agentd.sh restart</restart_command>
-	<menu>
-		<name>Zabbix-2 Agent</name>
-		<tooltiptext>Setup Zabbix Agent specific settings</tooltiptext>
-		<section>Services</section>
-		<url>/pkg_edit.php?xml=zabbix2-agent.xml&amp;id=0</url>
-	</menu>
-	<service>
-		<name>zabbix_agentd</name>
-		<rcfile>zabbix2_agentd.sh</rcfile>
-		<executable>zabbix_agentd</executable>
-		<description>Zabbix Agent runs on a host being monitored. The agent provides host's performance and availability information for Zabbix Server.</description>
-	</service>
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/pkg_edit.php?xml=zabbix2-agent.xml&amp;id=0</url>
-			<active />
-		</tab>
-	</tabs>
-	<fields>
-		<field>
-			<fielddescr>Server</fielddescr>
-			<fieldname>server</fieldname>
-			<description>List of comma delimited IP addresses (or hostnames) of ZABBIX servers</description>
-			<value>127.0.0.1</value>
-			<type>input</type>
-			<size>60</size>
-			<required>true</required>
-		</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>
-			<value></value>
-			<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>
-			<value>localhost</value>
-			<type>input</type>
-			<size>60</size>
-			<required>true</required>
-		</field>
-		<field>
-			<fielddescr>Listen IP</fielddescr>
-			<fieldname>listenip</fieldname>
-			<value>0.0.0.0</value>
-			<type>input</type>
-			<size>60</size>
-			<required>true</required>
-			<description>Listen IP for connections from the server (generally 0.0.0.0 for all interfaces)</description>
-		</field>
-		<field>
-			<fielddescr>Listen Port</fielddescr>
-			<fieldname>listenport</fieldname>
-			<value>10050</value>
-			<type>input</type>
-			<size>60</size>
-			<required>true</required>
-			<description>Listen port for connections from the server (generally 10050)</description>
-		</field>
-		<field>
-			<fielddescr>Refresh Active Checks</fielddescr>
-			<fieldname>refreshactchecks</fieldname>
-			<value>120</value>
-			<type>input</type>
-			<size>60</size>
-			<description>The agent will refresh list of active checks once per 120 (default) seconds.</description>
-		</field>
-		<field>
-			<fielddescr>Timeout</fielddescr>
-			<fieldname>timeout</fieldname>
-			<value>3</value>
-			<type>input</type>
-			<size>60</size>
-			<required>true</required>
-			<description>Timeout (default 3). Do not spend more that Timeout seconds on getting requested value (1-255). The agent does not kill timeouted User Parameters processes!</description>
-		</field>
-		<field>
-			<fielddescr>Buffer Send</fielddescr>
-			<fieldname>buffersend</fieldname>
-			<value>5</value>
-			<type>input</type>
-			<size>60</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>
-			<value>100</value>
-			<type>input</type>
-			<size>60</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>
-			<value>3</value>
-			<type>input</type>
-			<size>60</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>
-			<value></value>
-			<type>textarea</type>
-			<rows>5</rows>
-			<cols>50</cols>
-			<required>false</required>
-			<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>
-	<![CDATA[
-	global $config, $g;
-
-	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-	switch ($pfs_version) {
-		case "1.2":
-		case "2.0":
-			define('ZABBIX_AGENT_BASE','/usr/local');
-			break;
-		default:
-			define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix2-agent-' . php_uname("m"));
-	}
-
-	mwexec("mkdir -p /var/log/zabbix2/");
-	mwexec("mkdir -p /var/run/zabbix2/");
-
-	conf_mount_rw();
-
-	/* create a few directories and ensure the sample files are in place */
-	exec("/bin/mkdir -p " . ZABBIX_AGENT_BASE . "/etc/zabbix2");
-	exec("/bin/mkdir -p /var/log/zabbix2");
-	exec("/bin/mkdir -p /var/run/zabbix2");
-
-	exec("/bin/rm -f " . ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix2_agentd");
-
-	/* rc_file options */
-	$start  = "/bin/mkdir -p /var/log/zabbix2\n";
-	$start .= "/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix2\n";
-	$start .= "/bin/mkdir -p /var/run/zabbix2\n";
-	$start .= "/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix2\n";
-	$start .= "echo \"Starting Zabbix Agent...\"\n";
-	$start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n";
-
-	$stop  = "echo \"Stopping Zabbix Agent...\"\n";
-	$stop .= "/usr/bin/killall zabbix_agentd\n";
-	$stop .= "/bin/sleep 5\n";
-
-	/* write out rc.d start/stop file */
-	write_rcfile(array(
-					"file" => "zabbix2_agentd.sh",
-					"start" => "$start",
-					"stop" => "$stop"
-			)
-	);
-
-	conf_mount_ro();
-	]]>
-	</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>
-	<![CDATA[
-	global $_POST;
-	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-	switch ($pfs_version) {
-		case "1.2":
-		case "2.0":
-			define('ZABBIX_AGENT_BASE','/usr/local');
-			break;
-		default:
-			define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix2-agent-' . php_uname("m"));
-	}
-
-	$ListenIP=$_POST['listenip'];
-	if (!preg_match("/^(?:\d{1,3}\.){3}\d{1,3}$/", $ListenIP)) {
-		$input_errors[]='Listen IP is not an IP address.';
-	}
-
-	$ListenPort=$_POST['listenport'];
-	if (!preg_match("/^\d+$/", $ListenPort)) {
-		$input_errors[]='Listen Port is not numeric.';
-	}
-
-	$RefreshActiveChecks=$_POST['refreshactchecks'];
-	if ($RefreshActiveChecks != '') {
-		if (!preg_match("/^\d+$/", $RefreshActiveChecks)) {
-			$input_errors[]='Refresh Active Checks is not numeric.';
-		} elseif ( $RefreshActiveChecks < 60 || $RefreshActiveChecks > 3600 ) {
-			$input_errors[]='You must enter a valid value for \'Refresh Active Checks\'';
-		}
-	}
-
-	$Timeout=$_POST['timeout'];
-	if (!preg_match("/^\d+$/", $Timeout)) {
-		$input_errors[]='Timeout is not numeric.';
-	} elseif ( $Timeout < 1 || $Timeout > 255 ) {
-		$input_errors[]='You must enter a valid value for \'Timeout\'';
-	}
-
-	$BufferSend=$_POST['buffersend'];
-	if ($BufferSend != '') {
-		if (!preg_match("/^\d+$/", $BufferSend)) {
-			$input_errors[]='Buffer Send is not numeric.';
-		} elseif ( $BufferSend < 1 || $BufferSend > 3600 ) {
-			$input_errors[]='You must enter a valid value for \'Buffer Send\'';
-		}
-	}
-	
-	$BufferSize=$_POST['buffersize'];
-	if ($BufferSize != '') {
-		if (!preg_match("/^\d+$/", $BufferSize)) {
-			$input_errors[]='Bufer Size is not numeric.';
-		} elseif ( $BufferSize < 2 || $BufferSize > 65535 ) {
-			$input_errors[]='You must enter a valid value for \'Buffer Size\'';
-		}
-	}
-	
-	$StartAgents=$_POST['startagents'];
-	if ($StartAgents != '') {
-		if (!preg_match("/^\d+$/", $StartAgents)) {
-			$input_errors[]='Start Agents is not numeric.';
-		} elseif ( $StartAgents < 0 || $StartAgents > 100 ) {
-			$input_errors[]='You must enter a valid value for \'Start Agents\'';
-		}
-	}
-
-	]]>
-	</custom_php_validation_command>
-	<custom_add_php_command></custom_add_php_command>
-	<custom_php_resync_config_command>
-	<![CDATA[
-	conf_mount_rw();
-	global $config;
-	global $g;
-
-	$Server=$config['installedpackages']['zabbixagent']['config'][0]['server'];
-	$ServerActive=$config['installedpackages']['zabbixagent']['config'][0]['serveractive'];
-	$Hostname=$config['installedpackages']['zabbixagent']['config'][0]['hostname'];
-	$ListenIP=$config['installedpackages']['zabbixagent']['config'][0]['listenip'];
-	$ListenPort=$config['installedpackages']['zabbixagent']['config'][0]['listenport'];
-	$RefreshActChecks=($config['installedpackages']['zabbixagent']['config'][0]['refreshactchecks'] ? $config['installedpackages']['zabbixagent']['config'][0]['refreshactchecks'] : 120);
-	$Timeout=$config['installedpackages']['zabbixagent']['config'][0]['timeout'];
-	$BufferSend=($config['installedpackages']['zabbixagent']['config'][0]['buffersend'] ? $config['installedpackages']['zabbixagent']['config'][0]['buffersend'] : 5);
-	$BufferSize=($config['installedpackages']['zabbixagent']['config'][0]['buffersize'] ? $config['installedpackages']['zabbixagent']['config'][0]['buffersize'] : 100);
-	$StartAgents=($config['installedpackages']['zabbixagent']['config'][0]['startagents'] != '' ? $config['installedpackages']['zabbixagent']['config'][0]['startagents'] : 3);
-	$UserParams=base64_decode($config['installedpackages']['zabbixagent']['config'][0]['userparams']);
-
-	$conf = "Server=$Server\n";
-	$conf .= "ServerActive=$ServerActive\n";
-	$conf .= "Hostname=$Hostname\n";
-	$conf .= "ListenIP=$ListenIP\n";
-	$conf .= "ListenPort=$ListenPort\n";
-	$conf .= "RefreshActiveChecks=$RefreshActChecks\n";
-	$conf .= "DebugLevel=3\n";
-	$conf .= "PidFile=/var/run/zabbix2/zabbix2_agentd.pid\n";
-	$conf .= "LogFile=/var/log/zabbix2/zabbix2_agentd.log\n";
-	$conf .= "LogFileSize=1\n";
-	$conf .= "Timeout=$Timeout\n";
-	$conf .= "BufferSend=$BufferSend\n";
-	$conf .= "BufferSize=$BufferSize\n";
-	$conf .= "StartAgents=$StartAgents\n";
-	$conf .= "$UserParams\n";
-
-	file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix2/zabbix_agentd.conf", $conf);
-
-	/* rc_file options */
-	$start  = "/bin/mkdir -p /var/log/zabbix2\n";
-	$start .= "/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix2\n";
-	$start .= "/bin/mkdir -p /var/run/zabbix2\n";
-	$start .= "/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix2\n";
-	$start .= "echo \"Starting Zabbix Agent...\"\n";
-	$start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n";
-
-	$stop  = "echo \"Stopping Zabbix Agent...\"\n";
-	$stop .= "/usr/bin/killall zabbix_agentd\n";
-	$stop .= "/bin/sleep 5\n";
-
-	/* write out rc.d start/stop file */
-	write_rcfile(array(
-					"file" => "zabbix2_agentd.sh",
-					"start" => "$start",
-					"stop" => "$stop"
-			)
-	);
-
-	conf_mount_ro();
-
-	]]>
-	</custom_php_resync_config_command>
-	<custom_php_deinstall_command>
-	<![CDATA[
-	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-	switch ($pfs_version) {
-		case "1.2":
-		case "2.0":
-			define('ZABBIX_PROXY_BASE','/usr/local');
-			define('ZABBIX_AGENT_BASE','/usr/local');
-			break;
-		default:
-			define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix2-proxy-' . php_uname("m"));
-			define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix2-agent-' . php_uname("m"));
-	}
-
-	exec("/usr/bin/killall zabbix_agentd");
-
-	exec("/bin/rm " . ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix2_agentd.sh");
-
-	// Check if Zabbix-2 Proxy exists
-	if(file_exists(ZABBIX_PROXY_BASE . "/etc/zabbix2/zabbix_proxy.conf")) {
-		exec("/bin/rm  /var/log/zabbix2/zabbix2_agentd.log");
-		exec("/bin/rm  /var/run/zabbix2/zabbix2_agentd.pid");
-	} else {
-		exec("/bin/rm -r /var/log/zabbix2/");
-		exec("/bin/rm -r /var/run/zabbix2/");
-	}
-	]]>
-	</custom_php_deinstall_command>
-</packagegui>
diff --git a/config/zabbix2-proxy/zabbix2-proxy.xml b/config/zabbix2-proxy/zabbix2-proxy.xml
deleted file mode 100644
index f4d05173..00000000
--- a/config/zabbix2-proxy/zabbix2-proxy.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packagegui>
-	<name>zabbixproxy</name>
-	<title>Services: Zabbix-2 Proxy</title>
-	<category>Monitoring</category>
-	<version>0.5</version>
-	<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/zabbix2_proxy.sh restart</restart_command>
-	<menu>
-		<name>Zabbix-2 Proxy</name>
-		<tooltiptext>Setup Zabbix Proxy specific settings</tooltiptext>
-		<section>Services</section>
-		<url>/pkg_edit.php?xml=zabbix2-proxy.xml&amp;id=0</url>
-	</menu>
-	<service>
-		<name>zabbix-proxy</name>
-		<rcfile>zabbix2_proxy.sh</rcfile>
-		<executable>zabbix_proxy</executable>
-		<description>Zabbix proxy is a process which collects performance and availability data from one or more monitored devices and sends the information to a Zabbix server</description>
-	</service>
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/pkg_edit.php?xml=zabbix2-proxy.xml&amp;id=0</url>
-			<active />
-		</tab>
-	</tabs>
-	<fields>
-		<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>100</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>
-         <value>10051</value>
-         <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>100</size>
-			<required>true</required>
-		</field>
-		<field>
-			<fielddescr>Active Mode</fielddescr>
-			<fieldname>activemode</fieldname>
-			<description>Check to run Zabbix proxy in active mode (default)</description>
-			<default_value>on</default_value>
-			<type>checkbox</type>
-			<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>
-	</fields>
-	<custom_php_install_command>
-	<![CDATA[
-	global $config, $g;
-
-	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-	switch ($pfs_version) {
-		case "1.2":
-		case "2.0":
-			define('ZABBIX_PROXY_BASE', '/usr/local');
-			break;
-		case "2.1":
-			define('ZABBIX_PROXY_BASE', '/usr/local');
-			break;
-		default:
-			define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix2-proxy-' . php_uname("m"));
-	}
-
-	mwexec("mkdir -p /var/log/zabbix2/");
-	mwexec("mkdir -p /var/run/zabbix2/");
-	mwexec("mkdir -p /var/db/zabbix2/");
-
-	conf_mount_rw();
-
-	/* create a few directories and ensure the sample files are in place */
-	exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix2");
-	exec("/bin/mkdir -p /var/log/zabbix2");
-	exec("/bin/mkdir -p /var/run/zabbix2");
-	exec("/bin/mkdir -p /var/db/zabbix2");
-
-	exec("/bin/rm -f " . ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix2_proxy");
-
-	$start  = "/bin/mkdir -p /var/log/zabbix2\n";
-	$start .= "/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix2\n";
-
-	$start .= "/bin/mkdir -p /var/run/zabbix2\n";
-	$start .= "/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix2\n";
-
-	$start .= "/bin/mkdir -p /var/db/zabbix2\n";
-	$start .= "/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix2\n";
-
-	$start .= "echo \"Starting Zabbix Proxy\"...\n";
-
-	/* start zabbix proxy */
-	$start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n";
-
-	$stop  = "echo \"Stopping Zabbix Proxy\"\n";
-   $stop .= "/usr/bin/killall zabbix_proxy\n";
-	/* write out rc.d start/stop file */
-	write_rcfile(array(
-		"file" => "zabbix2_proxy.sh",
-		"start" => "{$start}",
-		"restart" => "$stop\n" . "sleep 5\n" . "{$start}",
-		"stop" => "$stop"
-		)
-	);
-
-	conf_mount_ro();
-	]]>
-	</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>
-	<![CDATA[
-	global $_POST;
-
-   $ServerPort=$_POST['serverport'];
-   if (!preg_match("/^\d+$/", $ServerPort)) {
-      $input_errors[]='Server Port is not numeric.';
-   }
-
-	$ConfigFrequency=$_POST['configfrequency'];
-	if (!preg_match("/^\d+$/", $ConfigFrequency)) {
-		$input_errors[]='Config Frequency is not numeric.';
-	}
-	]]>
-	</custom_php_validation_command>
-	<custom_add_php_command></custom_add_php_command>
-	<custom_php_resync_config_command>
-	<![CDATA[
-	conf_mount_rw();
-	global $config, $g;
-
-	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-	switch ($pfs_version) {
-		case "1.2":
-		case "2.0":
-			define('ZABBIX_PROXY_BASE', '/usr/local');
-			break;
-		default:
-			define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix2-proxy-' . php_uname("m"));
-	}
-
-	$zabbixproxy_config = $config['installedpackages']['zabbixproxy']['config'][0];
-
-	$Server=$zabbixproxy_config['server'];
-	$ServerPort=$zabbixproxy_config['serverport'];
-	$Hostname=$zabbixproxy_config['hostname'];
-	$ListenPort=$zabbixproxy_config['listenport'];
-	$ConfigFrequency=$zabbixproxy_config['configfrequency'];
-	if(isset($zabbixproxy_config['activemode'])) {
-		$Mode="0"; /* active */
-	} else {
-		$Mode="1"; /* passive */
-	}
-
-	$conf = "Server=$Server\n";
-	$conf .= "ServerPort=$ServerPort\n";
-	$conf .= "Hostname=$Hostname\n";
-	$conf .= "PidFile=/var/run/zabbix2/zabbix2_proxy.pid\n";
-	$conf .= "DBName=/var/db/zabbix2/proxy.db\n";
-	$conf .= "LogFile=/var/log/zabbix2/zabbix_proxy.log\n";
-	$conf .= "ConfigFrequency=$ConfigFrequency\n";
-	$conf .= "FpingLocation=/usr/local/sbin/fping\n";
-	/* there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin */
-	$conf .= "Fping6Location=/usr/local/sbin/fping6\n";
-	$conf .= "ProxyMode=$Mode\n";
-
-	file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix2/zabbix_proxy.conf", $conf);
-
-	$want_sysctls = array(
-		'kern.ipc.shmall' => '2097152',
-		'kern.ipc.shmmax' => '2147483648',
-		'kern.ipc.semmsl' => '250'
-	);
-	$sysctls = array();
-	if (file_exists("/etc/sysctl.conf")) {
-		$sc = file_get_contents("/etc/sysctl.conf");
-		$sc = explode("\n", $sc);
-		foreach ($sc as $num => $line) {
-			list($sysctl, $val) = explode("=", $line, 2);
-			if (array_key_exists($sysctl, $want_sysctls) || empty($sysctl))
-				unset($sc[$num]);
-		}
-	}
-	foreach ($want_sysctls as $ws => $wv) {
-		$sc[] = "{$ws}={$wv}";
-		exec("/sbin/sysctl {$ws}={$wv}");
-	}
-	file_put_contents("/etc/sysctl.conf", implode("\n", $sc) . "\n");
-
-	$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_get_contents("/boot/loader.conf");
-		$lt = explode("\n", $lt);
-		foreach ($lt as $num => $line) {
-			list($tunable, $val) = explode("=", $line, 2);
-			if (array_key_exists($tunable, $want_tunables) || empty($tunable))
-				unset($lt[$num]);
-		}
-	}
-	foreach ($want_tunables as $wt => $wv) {
-		$lt[] = "{$wt}={$wv}";
-	}
-	file_put_contents("/boot/loader.conf", implode("\n", $lt) . "\n");
-	chmod("/var/log/zabbix2", 0755);
-	chmod("/var/run/zabbix2", 0755);
-	conf_mount_ro();
-
-	]]>
-	</custom_php_resync_config_command>
-	<custom_php_deinstall_command>
-	<![CDATA[
-	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-	switch ($pfs_version) {
-		case "1.2":
-		case "2.0":
-			define('ZABBIX_AGENT_BASE', '/usr/local');
-			define('ZABBIX_PROXY_BASE', '/usr/local');
-			break;
-		default:
-			define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix2-agent-' . php_uname("m"));
-			define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix2-proxy-' . php_uname("m"));
-	}
-
-	exec("/usr/bin/killall zabbix_proxy");
-
-	exec("/bin/rm " . ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix2_proxy.sh");
-
-	// Check if Zabbix-2 Agent exists
-	if(file_exists(ZABBIX_AGENT_BASE . "/etc/zabbix2/zabbix_agentd.conf")) {
-		exec("/bin/rm  /var/log/zabbix2/zabbix_proxy.log");
-		exec("/bin/rm  /var/run/zabbix2/zabbix2_proxy.pid");
-	} else {
-		exec("/bin/rm -r /var/log/zabbix2/");
-		exec("/bin/rm -r /var/run/zabbix2/");
-	}
-
-	exec("/bin/rm -r /var/db/zabbix2/");
-	]]>
-	</custom_php_deinstall_command>
-</packagegui>
diff --git a/config/zabbix2/zabbix2-agent.xml b/config/zabbix2/zabbix2-agent.xml
new file mode 100644
index 00000000..41ba26fb
--- /dev/null
+++ b/config/zabbix2/zabbix2-agent.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packagegui>
+<copyright>
+	<![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+    zabbix2-agent.xml
+    part of the Zebedee 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>zabbixagent</name>
+	<title>Services: Zabbix-2 Agent</title>
+	<category>Monitoring</category>
+	<version>0.7</version>
+	<include_file>/usr/local/pkg/zabbix2.inc</include_file>
+	<addedit_string>Zabbix Agent has been created/modified.</addedit_string>
+	<delete_string>Zabbix Agent has been deleted.</delete_string>
+	<restart_command>/usr/local/etc/rc.d/zabbix2_agentd.sh restart</restart_command>
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/zabbix2/zabbix2.inc</item>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>
+	</additional_files_needed>
+	<menu>
+		<name>Zabbix-2 Agent</name>
+		<tooltiptext>Setup Zabbix Agent specific settings</tooltiptext>
+		<section>Services</section>
+		<url>/pkg_edit.php?xml=zabbix2-agent.xml&amp;id=0</url>
+	</menu>
+	<service>
+		<name>zabbix_agentd</name>
+		<rcfile>zabbix2_agentd.sh</rcfile>
+		<executable>zabbix_agentd</executable>
+		<description>Zabbix Agent runs on a host being monitored. The agent provides host's performance and availability information for Zabbix Server.</description>
+	</service>
+	<tabs>
+		<tab>
+			<text>Agent</text>
+			<url>/pkg_edit.php?xml=zabbix2-agent.xml&amp;id=0</url>
+			<active />
+		</tab>
+	</tabs>
+	<fields>
+		<field>
+			<name>Zabbix2 Agent Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>Enable</fielddescr>
+			<fieldname>agentenabled</fieldname>
+			<description>Enable Zabbix2 Agent 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>
+			<value>127.0.0.1</value>
+			<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>
+			<value></value>
+			<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>
+			<value>localhost</value>
+			<type>input</type>
+			<size>60</size>
+		</field>
+		<field>
+			<fielddescr>Listen IP</fielddescr>
+			<fieldname>listenip</fieldname>
+			<value>0.0.0.0</value>
+			<type>input</type>
+			<size>60</size>
+			<description>Listen IP for connections from the server (generally 0.0.0.0 for all interfaces)</description>
+		</field>
+		<field>
+			<fielddescr>Listen Port</fielddescr>
+			<fieldname>listenport</fieldname>
+			<value>10050</value>
+			<type>input</type>
+			<size>5</size>
+			<description>Listen port for connections from the server (generally 10050)</description>
+		</field>
+		<field>
+			<fielddescr>Refresh Active Checks</fielddescr>
+			<fieldname>refreshactchecks</fieldname>
+			<value>120</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>
+			<value>3</value>
+			<type>input</type>
+			<size>5</size>
+			<description>Timeout (default 3). Do not spend more that Timeout seconds on getting requested value (1-255). The agent does not kill timeouted User Parameters processes!</description>
+		</field>
+		<field>
+			<fielddescr>Buffer Send</fielddescr>
+			<fieldname>buffersend</fieldname>
+			<value>5</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>
+			<value>100</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>
+			<value>3</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>
+			<value></value>
+			<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_zabbix2();</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_zabbix2($_POST, &amp;$input_errors);</custom_php_validation_command>
+	<custom_add_php_command></custom_add_php_command>
+	<custom_php_resync_config_command>sync_package_zabbix2();</custom_php_resync_config_command>
+	<custom_php_deinstall_command>php_deinstall_zabbix2();</custom_php_deinstall_command>
+</packagegui>
diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml
new file mode 100644
index 00000000..4441df99
--- /dev/null
+++ b/config/zabbix2/zabbix2-proxy.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packagegui>
+<copyright>
+	<![CDATA[
+/* $Id$ */
+/* ========================================================================== */
+/*
+    zabbix2-proxy.xml
+    part of the Zebedee 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>zabbixproxy</name>
+	<title>Services: Zabbix-2 Proxy</title>
+	<category>Monitoring</category>
+	<version>0.7</version>
+	<include_file>/usr/local/pkg/zabbix2.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/zabbix2_proxy.sh restart</restart_command>
+	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/zabbix2/zabbix2.inc</item>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>
+	</additional_files_needed>
+	<menu>
+		<name>Zabbix-2 Proxy</name>
+		<tooltiptext>Setup Zabbix Proxy specific settings</tooltiptext>
+		<section>Services</section>
+		<url>/pkg_edit.php?xml=zabbix2-proxy.xml&amp;id=0</url>
+	</menu>
+	<service>
+		<name>zabbix-proxy</name>
+		<rcfile>zabbix2_proxy.sh</rcfile>
+		<executable>zabbix_proxy</executable>
+		<description>Zabbix proxy is a process which collects performance and availability data from one or more monitored devices and sends the information to a Zabbix server</description>
+	</service>
+	<tabs>
+		<tab>
+			<text>Proxy</text>
+			<url>/pkg_edit.php?xml=zabbix2-proxy.xml&amp;id=0</url>
+			<active />
+		</tab>
+	</tabs>
+	<fields>
+		<field>
+			<name>Zabbix2 Proxy Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>Enable</fielddescr>
+			<fieldname>proxyenabled</fieldname>
+			<description>Enable Zabbix2 Proxy 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>
+	</fields>
+	<custom_php_install_command>sync_package_zabbix2();</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_zabbix2($_POST, &amp;$input_errors);</custom_php_validation_command>
+	<custom_add_php_command></custom_add_php_command>
+	<custom_php_resync_config_command>sync_package_zabbix2();</custom_php_resync_config_command>
+	<custom_php_deinstall_command>php_deinstall_zabbix2();</custom_php_deinstall_command>
+</packagegui>
diff --git a/config/zabbix2/zabbix2.inc b/config/zabbix2/zabbix2.inc
new file mode 100644
index 00000000..55dcff2f
--- /dev/null
+++ b/config/zabbix2/zabbix2.inc
@@ -0,0 +1,340 @@
+<?php
+/* $Id$ */
+/* ========================================================================== */
+/*
+    zabbix2-proxy.inc
+    part of the Zebedee 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");
+
+function php_install_zabbix2(){
+	sync_package_zabbix2();	
+}
+
+function php_deinstall_zabbix2(){
+	global $config, $g;
+
+	conf_mount_rw();
+	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+	if ($pfs_version > 2.0){
+		define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix2-agent-' . php_uname("m"));
+		define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix2-proxy-' . php_uname("m"));
+	} else {
+		define('ZABBIX_AGENT_BASE', '/usr/local');
+		define('ZABBIX_PROXY_BASE', '/usr/local');
+	}
+	
+	exec("/usr/bin/killall zabbix_proxy");
+	unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix2_proxy.sh");
+	unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix2/zabbix_proxy.conf");
+	unlink_if_exists("/var/log/zabbix2/zabbix_proxy.log");
+	unlink_if_exists("/var/run/zabbix2/zabbix2_proxy.pid");
+
+	exec("/usr/bin/killall zabbix_agentd");
+	unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix2_agentd.sh");
+	unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/zabbix2/zabbix_agentd.conf");
+	unlink_if_exists("/var/log/zabbix2/zabbix2_agentd.log");
+	unlink_if_exists("/var/run/zabbix2/zabbix2_agentd.pid");
+
+	if (is_dir("/var/log/zabbix2"))
+		exec("/bin/rm -r /var/log/zabbix2/");
+	if (is_dir("/var/run/zabbix2"))
+		exec("/bin/rm -r /var/run/zabbix2/");
+	if (is_dir("/var/db/zabbix2"))
+		exec("/bin/rm -r /var/db/zabbix2/");
+		conf_mount_ro();
+}
+
+function validate_input_zabbix2($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 (!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 (!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 (!is_numericint($post['timeout'])) {
+			$input_errors[]='Timeout is not numeric.';
+		} elseif ( $post['timeout'] < 1 || $post['timeout'] > 255 ) {
+			$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_zabbix2(){
+	global $config, $g;
+
+	conf_mount_rw();
+	#check pfsense version
+	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+	if ($pfs_version > 2.0){
+		define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix2-agent-' . php_uname("m"));
+		define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix2-proxy-' . php_uname("m"));
+		}
+	else
+		define('ZABBIX_AGENT_BASE', '/usr/local');
+		define('ZABBIX_PROXY_BASE', '/usr/local');
+
+	#check zabbix proxy config
+	if (is_array($config['installedpackages']['zabbixproxy'])){
+		$zbproxy_config = $config['installedpackages']['zabbixproxy']['config'][0];
+		if ($zbproxy_config['proxyenabled']=="on"){
+			$Mode=(is_numericint($zbproxy_config['proxymode'])?$zbproxy_config['proxymode'] : 0);
+		
+			$zbproxy_conf_file = <<< EOF
+Server={$zbproxy_config['server']}
+ServerPort={$zbproxy_config['serverport']}
+Hostname={$zbproxy_config['hostname']}
+PidFile=/var/run/zabbix2/zabbix2_proxy.pid
+DBName=/var/db/zabbix2/proxy.db
+LogFile=/var/log/zabbix2/zabbix_proxy.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}
+
+EOF;
+			file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix2/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => "")));
+		}
+	}
+	/* check zabbix agent settings*/
+	if (is_array($config['installedpackages']['zabbixagent'])){
+		$zbagent_config = $config['installedpackages']['zabbixagent']['config'][0];
+		if ($zbagent_config['agentenabled']=="on"){
+			$RefreshActChecks=($zbagent_config['refreshactchecks'] ? $zbagent_config['refreshactchecks'] : 120);
+			$BufferSend=($zbagent_config['buffersend'] ? $zbagent_config['buffersend'] : 5);
+			$BufferSize=($zbagent_config['buffersize'] ? $zbagent_config['buffersize'] : 100);
+			$StartAgents=($zbagent_config['startagents'] != '' ? $zbagent_config['startagents'] : 3);
+			$UserParams=base64_decode($zbagent_config['userparams']);
+		
+			$zbagent_conf_file = <<< EOF
+Server={$zbagent_config['server']}
+ServerActive={$zbagent_config['serveractive']}]
+Hostname={$zbagent_config['hostname']}
+ListenIP={$zbagent_config['listenip']}
+ListenPort={$zbagent_config['listenport']}
+RefreshActiveChecks={$StartAgents};
+DebugLevel=3\n";
+PidFile=/var/run/zabbix2/zabbix2_agentd.pid\n";
+LogFile=/var/log/zabbix2/zabbix2_agentd.log\n";
+LogFileSize=1\n";
+Timeout={$zbagent_config['timeout']}
+BufferSend={$BufferSend}
+BufferSize={$BufferSize}
+StartAgents={$zbagent_config['server']}
+$UserParams\n";
+
+EOF;
+
+		file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix2/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/zabbix2"))
+		exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix2");
+
+	$dir_checks  = <<< EOF
+if [ ! -d /var/log/zabbix2 ]
+ then
+ /bin/mkdir -p /var/log/zabbix2
+ /usr/sbin/chmod 755 /var/log/zabbix2
+ fi
+/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix2
+
+if [ ! -d /var/run/zabbix2 ]
+ then
+ /bin/mkdir -p /var/run/zabbix2
+ /usr/sbin/chmod 755 /var/run/zabbix2
+ fi
+/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix2
+
+if [ ! -d /var/db/zabbix2 ]
+ then
+ /bin/mkdir -p /var/db/zabbix2
+ /usr/sbin/chmod 755 /var/db/zabbix2
+ fi
+/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix2
+
+EOF;
+ 
+	$zproxy_rcfile="/usr/local/etc/rc.d/zabbix2_proxy.sh";
+	if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){
+		$zproxy_start= strtr($dir_checks, array("\r" => "")). "echo \"Starting Zabbix Proxy\"...\n";
+		/* start zabbix proxy */
+		$zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n";
+	
+		$zproxy_stop  = "echo \"Stopping Zabbix Proxy\"\n";
+	    $zproxy_stop .= "/usr/bin/killall zabbix_proxy\n";
+		/* write out rc.d start/stop file */
+		write_rcfile(array(
+			"file" => "zabbix2_proxy.sh",
+			"start" => $zproxy_start,
+			"restart" => $zproxy_stop . "\nsleep 5\n" . $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/zabbix2_agentd.sh";
+	if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){
+		$zagent_start .= strtr($dir_checks, array("\r" => "")). "echo \"Starting Zabbix Agent...\"\n";
+		$zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n";
+	
+		$zagent_stop  = "echo \"Stopping Zabbix Agent...\"\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" => "zabbix2_agentd.sh",
+						"start" => "$zagent_start",
+						"restart" => "$zagent_stop\n" . "sleep 5\n" . "{$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();
+}
+?>
\ No newline at end of file
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index c4839470..0912a439 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1797,8 +1797,8 @@
 		<name>Zabbix-2 Agent</name>
 		<descr>Monitoring agent.</descr>
 		<category>Services</category>
-		<config_file>http://www.pfsense.org/packages/config/zabbix2-agent/zabbix2-agent.xml</config_file>
-		<version>zabbix2-agent-2.0.4 pkg v0.6</version>
+		<config_file>http://www.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
+		<version>zabbix2-agent-2.0.4 pkg v0.6_1</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1816,8 +1816,8 @@
 		<name>Zabbix-2 Proxy</name>
 		<descr>Monitoring agent proxy.</descr>
 		<category>Services</category>
-		<config_file>http://www.pfsense.org/packages/config/zabbix2-proxy/zabbix2-proxy.xml</config_file>
-		<version>zabbix2-proxy-2.0.4 pkg v0.5</version>
+		<config_file>http://www.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
+		<version>zabbix2-proxy-2.0.4 pkg v0.6_1</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-proxy.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 7ed2207e..c5573b2c 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1784,7 +1784,7 @@
 		<name>Zabbix-2 Agent</name>
 		<descr>Monitoring agent.</descr>
 		<category>Services</category>
-		<config_file>http://www.pfsense.org/packages/config/zabbix2-agent/zabbix2-agent.xml</config_file>
+		<config_file>http://www.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
 		<version>zabbix2-agent-2.0.4 pkg v0.6</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
@@ -1803,7 +1803,7 @@
 		<name>Zabbix-2 Proxy</name>
 		<descr>Monitoring agent proxy.</descr>
 		<category>Services</category>
-		<config_file>http://www.pfsense.org/packages/config/zabbix2-proxy/zabbix2-proxy.xml</config_file>
+		<config_file>http://www.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
 		<version>zabbix2-proxy-2.0.4 pkg v0.5</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
-- 
cgit v1.2.3