From 6d9c4778752ae5d85d84edae9fecc56a85da770a Mon Sep 17 00:00:00 2001
From: Perry Mason <crazypark2@yahoo.dk>
Date: Fri, 20 Feb 2009 15:43:39 +0100
Subject: url change for zabbix xml and tbz

---
 config/zabbix-agent.xml              | 164 -----------------------------------
 config/zabbix-agent/zabbix-agent.xml | 164 +++++++++++++++++++++++++++++++++++
 pkg_config.7.xml                     |   6 +-
 3 files changed, 167 insertions(+), 167 deletions(-)
 delete mode 100644 config/zabbix-agent.xml
 create mode 100644 config/zabbix-agent/zabbix-agent.xml

diff --git a/config/zabbix-agent.xml b/config/zabbix-agent.xml
deleted file mode 100644
index 54184b32..00000000
--- a/config/zabbix-agent.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packagegui>
-  <name>zabbixagent</name>
-  <title>Services: Zabbix Agent</title>
-  <category>Monitoring</category>
-  <version>1.0</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/zabbix_agentd.sh restart</restart_command>
-  <menu>
-    <name>Zabbix Agent</name>
-    <tooltiptext>Setup Zabbix Agent specific settings</tooltiptext>
-    <section>Services</section>
-    <url>/pkg_edit.php?xml=zabbix-agent.xml&amp;id=0</url>
-  </menu>
-  <service>
-    <name>zabbix-agent</name>
-    <rcfile>zabbix-agentd.sh</rcfile>
-    <executable>zabbix_agentd</executable>
-  </service>
-  <tabs>
-    <tab>
-      <text>Settings</text>
-      <url>/pkg_edit.php?xml=zabbix-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 Port</fielddescr>
-      <fieldname>serverport</fieldname>
-      <description>Server port for sending active check (generally 10051)</description>
-      <value>10051</value>
-      <type>input</type>
-      <size>60</size>
-      <required>true</required>
-    </field>
-    <field>
-      <fielddescr>Hostname</fielddescr>
-      <fieldname>hostname</fieldname>
-      <description>Unique hostname. Required for active checks.</description>
-      <value>localhost</value>
-      <type>input</type>
-      <size>60</size>
-      <required>true</required>
-    </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 sending active check (generally 10050)</description>
-    </field>
-  </fields>
-	<custom_php_install_command>
-	<![CDATA[
-		global $config, $g;
-
-		mwexec("mkdir -p /var/log/zabbix/");
-		mwexec("mkdir -p /var/run/zabbix/");
-
-		conf_mount_rw();
-
-		/* create a few directories and ensure the sample files are in place */
-		exec("/bin/mkdir -p /usr/local/etc/zabbix");
-		exec("/bin/mkdir -p /var/log/zabbix");
-		exec("/bin/mkdir -p /var/run/zabbix");
-
-		exec("/bin/rm -f /usr/local/etc/rc.d/zabbix_agentd");
-
-		$start  = "/bin/mkdir -p /var/log/zabbix\n";
-		$start  .= "/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix\n";
-
-		$start  .= "/bin/mkdir -p /var/run/zabbix\n";
-		$start  .= "/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix\n";
-
-        $start  .= "echo \"Starting Zabbix Agent\"...\n";
-
-		/* start zabbix agent */
-		$start .= "/usr/local/bin/zabbix_agentd\n";
-
-        $stop = "echo \"Stopping Zabbix Agent\"\n";
-        $stop .= "/usr/bin/killall zabbix_agentd\n";
-
-		/* write out rc.d start/stop file */
-		write_rcfile(array(
-						"file" => "zabbix_agentd.sh",
-						"start" => "{$start}",
-						"restart" => "$stop\nsleep 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;
-        
-        $ListenPort=$_POST['listenport'];
-        if (!preg_match("/^\d+$/", $ListenPort)) {
-                $input_errors[]='Listen Port is not numeric.';
-        }
-
-        $ServerPort=$_POST['serverport'];
-        if (!preg_match("/^\d+$/", $ServerPort)) {
-                $input_errors[]='Server Port is not numeric.';
-        }
-    ]]>
-	</custom_php_validation_command>
-	<custom_add_php_command></custom_add_php_command>
-	<custom_php_resync_config_command>
-    <![CDATA[
-		global $config;
-		global $g;
-
-		$Server=$config['installedpackages']['zabbixagent']['config'][0]['server'];
-		$ServerPort=$config['installedpackages']['zabbixagent']['config'][0]['serverport'];
-		$Hostname=$config['installedpackages']['zabbixagent']['config'][0]['hostname'];
-		$ListenPort=$config['installedpackages']['zabbixagent']['config'][0]['listenport'];
-
-        $conf = "Server=$Server\n";
-        $conf .= "ServerPort=$ServerPort\n";
-        $conf .= "Hostname=$Hostname\n";
-        $conf .= "ListenIP=0.0.0.0\n"; 
-        $conf .= "ListenPort=$ListenPort\n";
-        $conf .= "StartAgents=5\n";
-        $conf .= "DebugLevel=3\n";
-        $conf .= "PidFile=/var/run/zabbix/zabbix_agentd.pid\n";
-        $conf .= "LogFile=/var/log/zabbix/zabbix_agentd.log\n";
-        $conf .= "LogFileSize=1\n";
-        $conf .= "Timeout=3\n";
-
-        file_put_contents("/usr/local/etc/zabbix/zabbix_agentd.conf", $conf);
-
-    ]]>
-	</custom_php_resync_config_command>
-	<custom_php_resync_command></custom_php_resync_command>
-	<custom_php_deinstall_command>
-    <![CDATA[
-		exec("/usr/bin/killall zabbix_agentd");
-
-		exec("/bin/rm /usr/local/etc/rc.d/zabbix_agentd.sh");
-
-		exec("/bin/rm -r /var/log/zabbix/");
-		exec("/bin/rm -r /var/run/zabbix/");
-	]]>
-	</custom_php_deinstall_command>
-</packagegui>
diff --git a/config/zabbix-agent/zabbix-agent.xml b/config/zabbix-agent/zabbix-agent.xml
new file mode 100644
index 00000000..54184b32
--- /dev/null
+++ b/config/zabbix-agent/zabbix-agent.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packagegui>
+  <name>zabbixagent</name>
+  <title>Services: Zabbix Agent</title>
+  <category>Monitoring</category>
+  <version>1.0</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/zabbix_agentd.sh restart</restart_command>
+  <menu>
+    <name>Zabbix Agent</name>
+    <tooltiptext>Setup Zabbix Agent specific settings</tooltiptext>
+    <section>Services</section>
+    <url>/pkg_edit.php?xml=zabbix-agent.xml&amp;id=0</url>
+  </menu>
+  <service>
+    <name>zabbix-agent</name>
+    <rcfile>zabbix-agentd.sh</rcfile>
+    <executable>zabbix_agentd</executable>
+  </service>
+  <tabs>
+    <tab>
+      <text>Settings</text>
+      <url>/pkg_edit.php?xml=zabbix-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 Port</fielddescr>
+      <fieldname>serverport</fieldname>
+      <description>Server port for sending active check (generally 10051)</description>
+      <value>10051</value>
+      <type>input</type>
+      <size>60</size>
+      <required>true</required>
+    </field>
+    <field>
+      <fielddescr>Hostname</fielddescr>
+      <fieldname>hostname</fieldname>
+      <description>Unique hostname. Required for active checks.</description>
+      <value>localhost</value>
+      <type>input</type>
+      <size>60</size>
+      <required>true</required>
+    </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 sending active check (generally 10050)</description>
+    </field>
+  </fields>
+	<custom_php_install_command>
+	<![CDATA[
+		global $config, $g;
+
+		mwexec("mkdir -p /var/log/zabbix/");
+		mwexec("mkdir -p /var/run/zabbix/");
+
+		conf_mount_rw();
+
+		/* create a few directories and ensure the sample files are in place */
+		exec("/bin/mkdir -p /usr/local/etc/zabbix");
+		exec("/bin/mkdir -p /var/log/zabbix");
+		exec("/bin/mkdir -p /var/run/zabbix");
+
+		exec("/bin/rm -f /usr/local/etc/rc.d/zabbix_agentd");
+
+		$start  = "/bin/mkdir -p /var/log/zabbix\n";
+		$start  .= "/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix\n";
+
+		$start  .= "/bin/mkdir -p /var/run/zabbix\n";
+		$start  .= "/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix\n";
+
+        $start  .= "echo \"Starting Zabbix Agent\"...\n";
+
+		/* start zabbix agent */
+		$start .= "/usr/local/bin/zabbix_agentd\n";
+
+        $stop = "echo \"Stopping Zabbix Agent\"\n";
+        $stop .= "/usr/bin/killall zabbix_agentd\n";
+
+		/* write out rc.d start/stop file */
+		write_rcfile(array(
+						"file" => "zabbix_agentd.sh",
+						"start" => "{$start}",
+						"restart" => "$stop\nsleep 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;
+        
+        $ListenPort=$_POST['listenport'];
+        if (!preg_match("/^\d+$/", $ListenPort)) {
+                $input_errors[]='Listen Port is not numeric.';
+        }
+
+        $ServerPort=$_POST['serverport'];
+        if (!preg_match("/^\d+$/", $ServerPort)) {
+                $input_errors[]='Server Port is not numeric.';
+        }
+    ]]>
+	</custom_php_validation_command>
+	<custom_add_php_command></custom_add_php_command>
+	<custom_php_resync_config_command>
+    <![CDATA[
+		global $config;
+		global $g;
+
+		$Server=$config['installedpackages']['zabbixagent']['config'][0]['server'];
+		$ServerPort=$config['installedpackages']['zabbixagent']['config'][0]['serverport'];
+		$Hostname=$config['installedpackages']['zabbixagent']['config'][0]['hostname'];
+		$ListenPort=$config['installedpackages']['zabbixagent']['config'][0]['listenport'];
+
+        $conf = "Server=$Server\n";
+        $conf .= "ServerPort=$ServerPort\n";
+        $conf .= "Hostname=$Hostname\n";
+        $conf .= "ListenIP=0.0.0.0\n"; 
+        $conf .= "ListenPort=$ListenPort\n";
+        $conf .= "StartAgents=5\n";
+        $conf .= "DebugLevel=3\n";
+        $conf .= "PidFile=/var/run/zabbix/zabbix_agentd.pid\n";
+        $conf .= "LogFile=/var/log/zabbix/zabbix_agentd.log\n";
+        $conf .= "LogFileSize=1\n";
+        $conf .= "Timeout=3\n";
+
+        file_put_contents("/usr/local/etc/zabbix/zabbix_agentd.conf", $conf);
+
+    ]]>
+	</custom_php_resync_config_command>
+	<custom_php_resync_command></custom_php_resync_command>
+	<custom_php_deinstall_command>
+    <![CDATA[
+		exec("/usr/bin/killall zabbix_agentd");
+
+		exec("/bin/rm /usr/local/etc/rc.d/zabbix_agentd.sh");
+
+		exec("/bin/rm -r /var/log/zabbix/");
+		exec("/bin/rm -r /var/run/zabbix/");
+	]]>
+	</custom_php_deinstall_command>
+</packagegui>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 6df8c50e..53a1550b 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -569,13 +569,13 @@
       <name>Zabbix Agent</name>
       <descr>Monitoring agent.</descr>
       <category>Services</category>
-      <config_file>http://www.pfsense.com/packages/config/zabbix-agent.xml</config_file>
+      <config_file>http://www.pfsense.com/packages/config/zabbix-agent/zabbix-agent.xml</config_file>
       <version>0.22</version>
       <status>FINAL</status>
-      <required_version>1.2.1</required_version>
+      <required_version>1.2.3</required_version>
       <configurationfile>zabbix-agent.xml</configurationfile>
       <maintainer>remco.verhoef@redfive.biz</maintainer>
-      <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/net-mgmt/</depends_on_package_base_url>
+      <depends_on_package_base_url>http://www.pfsense.com/packages/config/zabbix-agent/bin/</depends_on_package_base_url>
       <depends_on_package>zabbix-agent-1.4.5,2.tbz</depends_on_package>
     </package>
     <package>
-- 
cgit v1.2.3