diff options
| author | Jim P <jim@pingle.org> | 2013-01-25 12:47:21 -0800 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2013-01-25 12:47:21 -0800 |
| commit | 0e74f31e46475a576d43a8ae4197a3fd694524fa (patch) | |
| tree | f0963905f5e521669b16f47c76f060b507462134 | |
| parent | d482ed1605fe52a3eba666f4ac303fed5bebe8db (diff) | |
| parent | df7a6aaee015ddd1708c33ac806967a20c9494a3 (diff) | |
| download | pfsense-packages-0e74f31e46475a576d43a8ae4197a3fd694524fa.tar.gz pfsense-packages-0e74f31e46475a576d43a8ae4197a3fd694524fa.tar.bz2 pfsense-packages-0e74f31e46475a576d43a8ae4197a3fd694524fa.zip | |
Merge pull request #362 from dbaio/master
Remove obsolete config options
| -rw-r--r-- | config/zabbix2-agent/zabbix2-agent.xml | 25 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
2 files changed, 3 insertions, 24 deletions
diff --git a/config/zabbix2-agent/zabbix2-agent.xml b/config/zabbix2-agent/zabbix2-agent.xml index 6d95e81b..4394b5ef 100644 --- a/config/zabbix2-agent/zabbix2-agent.xml +++ b/config/zabbix2-agent/zabbix2-agent.xml @@ -3,7 +3,7 @@ <name>zabbixagent</name> <title>Services: Zabbix-2 Agent</title> <category>Monitoring</category> - <version>0.3</version> + <version>0.4</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> @@ -40,10 +40,9 @@ <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>127.0.0.1</value> + <value></value> <type>input</type> <size>60</size> - <required>true</required> </field> <field> <fielddescr>Hostname</fielddescr> @@ -91,18 +90,6 @@ <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>Disable active checks</fielddescr> - <fieldname>disableactive</fieldname> - <type>checkbox</type> - <description>The agent will work only in passive mode listening for server. (generally net set)</description> - </field> - <field> - <fielddescr>Disable passive checks</fielddescr> - <fieldname>disablepassive</fieldname> - <type>checkbox</type> - <description>The agent will not listen on any TCP port. Only active checks will be processed. (generally not set)</description> - </field> - <field> <fielddescr>User Parameters</fielddescr> <fieldname>userparams</fieldname> <encoding>base64</encoding> @@ -216,8 +203,6 @@ $ListenPort=$config['installedpackages']['zabbixagent']['config'][0]['listenport']; $RefreshActChecks=$config['installedpackages']['zabbixagent']['config'][0]['refreshactchecks']; $Timeout=$config['installedpackages']['zabbixagent']['config'][0]['timeout']; - $DisableActive=$config['installedpackages']['zabbixagent']['config'][0]['disableactive']; - $DisablePassive=$config['installedpackages']['zabbixagent']['config'][0]['disablepassive']; $UserParams=base64_decode($config['installedpackages']['zabbixagent']['config'][0]['userparams']); $conf = "Server=$Server\n"; @@ -232,12 +217,6 @@ $conf .= "LogFile=/var/log/zabbix2/zabbix2_agentd.log\n"; $conf .= "LogFileSize=1\n"; $conf .= "Timeout=$Timeout\n"; - if (isset($DisableActive) && ($DisableActive == "on")) { - $conf .= "DisableActive=1\n"; - } - if (isset($DisablePassive) && ($DisablePassive == "on")) { - $conf .= "DisablePassive=1\n"; - } $conf .= "$UserParams\n"; file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix2/zabbix_agentd.conf", $conf); diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index b9313c03..b7ca71da 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1790,7 +1790,7 @@ <custom_name>zabbix2-agent</custom_name> <port>net-mgmt/zabbix2-agent</port> </build_pbi> - <depends_on_package_base_url>http://www.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> + <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package>zabbix2-agent-2.0.4.tbz</depends_on_package> <depends_on_package_pbi>zabbix2-agent-2.0.4-amd64.pbi</depends_on_package_pbi> </package> |