aboutsummaryrefslogtreecommitdiffstats
path: root/config/zabbix2
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-11-16 20:54:48 +0100
committerdoktornotor <notordoktor@gmail.com>2015-11-16 20:54:48 +0100
commitf9203248ee52ada8e1aed468b4987d1584adec23 (patch)
treeafcf257b2aa87db23b34a0d3447677625cb65d18 /config/zabbix2
parentf723fe3a34a59379b13bf233aa1f458a1d9e5678 (diff)
downloadpfsense-packages-f9203248ee52ada8e1aed468b4987d1584adec23.tar.gz
pfsense-packages-f9203248ee52ada8e1aed468b4987d1584adec23.tar.bz2
pfsense-packages-f9203248ee52ada8e1aed468b4987d1584adec23.zip
Stop sharing include file between two packages Bug #3495
Diffstat (limited to 'config/zabbix2')
-rw-r--r--config/zabbix2/zabbix2-proxy.xml17
1 files changed, 7 insertions, 10 deletions
diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml
index 398c3df4..c39bbdc6 100644
--- a/config/zabbix2/zabbix2-proxy.xml
+++ b/config/zabbix2/zabbix2-proxy.xml
@@ -45,13 +45,13 @@
<name>zabbixproxy</name>
<title>Services: Zabbix-2 Proxy</title>
<category>Monitoring</category>
- <version>0.8.4</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>
+ <version>0.8.5</version>
+ <include_file>/usr/local/pkg/zabbix2-proxy.inc</include_file>
+ <addedit_string>Zabbix Proxy configuration has been created/modified.</addedit_string>
+ <delete_string>Zabbix Proxy configuration has been deleted.</delete_string>
<restart_command>/usr/local/etc/rc.d/zabbix2_proxy.sh restart</restart_command>
<additional_files_needed>
- <item>https://packages.pfsense.org/packages/config/zabbix2/zabbix2.inc</item>
+ <item>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.inc</item>
<prefix>/usr/local/pkg/</prefix>
</additional_files_needed>
<additional_files_needed>
@@ -148,14 +148,11 @@
<advancedfield/>
</field>
</fields>
- <custom_php_install_command>
- sync_package_zabbix2();
- </custom_php_install_command>
<custom_php_validation_command>
- validate_input_zabbix2($_POST, $input_errors);
+ validate_input_zabbix2_proxy($_POST, $input_errors);
</custom_php_validation_command>
<custom_php_resync_config_command>
- sync_package_zabbix2();
+ sync_package_zabbix2_proxy();
</custom_php_resync_config_command>
<custom_php_deinstall_command>
php_deinstall_zabbix2_proxy();