aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanilo G. Baio (dbaio) <dbaio@bsd.com.br>2015-02-18 12:19:28 -0200
committerDanilo G. Baio (dbaio) <dbaio@bsd.com.br>2015-02-18 12:19:28 -0200
commit22ab5415000130a28403d6efe93d2ea3249b676c (patch)
tree3201d07d6e9cd249cb1b923b2ed5448b90293c34
parent31717b4b930b87abd01f0d7af010c74a4047e5c3 (diff)
downloadpfsense-packages-22ab5415000130a28403d6efe93d2ea3249b676c.tar.gz
pfsense-packages-22ab5415000130a28403d6efe93d2ea3249b676c.tar.bz2
pfsense-packages-22ab5415000130a28403d6efe93d2ea3249b676c.zip
zabbix - rename PBI custom_name
-rw-r--r--config/zabbix-lts/zabbix-lts.inc8
-rw-r--r--pkg_config.10.xml4
2 files changed, 6 insertions, 6 deletions
diff --git a/config/zabbix-lts/zabbix-lts.inc b/config/zabbix-lts/zabbix-lts.inc
index 8f2a708d..47ea39c5 100644
--- a/config/zabbix-lts/zabbix-lts.inc
+++ b/config/zabbix-lts/zabbix-lts.inc
@@ -47,7 +47,7 @@ function php_deinstall_zabbix_agent_lts(){
conf_mount_rw();
- define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix-agent-lts-' . php_uname("m"));
+ define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m"));
exec("/usr/bin/killall zabbix_agentd");
unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix_agentd_lts.sh");
@@ -70,7 +70,7 @@ function php_deinstall_zabbix_proxy_lts(){
conf_mount_rw();
- define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix-proxy-lts-' . php_uname("m"));
+ define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m"));
exec("/usr/bin/killall zabbix_proxy");
unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix_proxy_lts.sh");
@@ -170,8 +170,8 @@ function sync_package_zabbix_lts(){
conf_mount_rw();
- define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix-agent-lts-' . php_uname("m"));
- define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix-proxy-lts-' . php_uname("m"));
+ define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m"));
+ define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m"));
#check zabbix proxy config
if (is_array($config['installedpackages']['zabbixproxylts'])){
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 83cda467..005546fd 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1316,7 +1316,7 @@
<configurationfile>zabbix-agent-lts.xml</configurationfile>
<maintainer>dbaio@bsd.com.br</maintainer>
<build_pbi>
- <custom_name>zabbix-agent-lts</custom_name>
+ <custom_name>zabbix22-agent</custom_name>
<port>net-mgmt/zabbix22-agent</port>
</build_pbi>
<depends_on_package_pbi>zabbix22-agent-2.2.7-##ARCH##.pbi</depends_on_package_pbi>
@@ -1335,7 +1335,7 @@
<configurationfile>zabbix-proxy-lts.xml</configurationfile>
<maintainer>dbaio@bsd.com.br</maintainer>
<build_pbi>
- <custom_name>zabbix-proxy-lts</custom_name>
+ <custom_name>zabbix22-proxy</custom_name>
<port>net-mgmt/zabbix22-proxy</port>
</build_pbi>
<build_options>OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI</build_options>