zabbix proxy/agent - rename a function used by both packages

pfsense · May 13, 2016 · e6e99f3 · e6e99f3
1 parent 7bd4435
commit e6e99f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/net-mgmt/pfSense-pkg-zabbix-agent/files/usr/local/pkg/zabbix-agent-lts.inc b/net-mgmt/pfSense-pkg-zabbix-agent/files/usr/local/pkg/zabbix-agent-lts.inc
@@ -141,25 +141,25 @@ function sync_package_zabbix_agent_lts() {
 			} else {
 				if ($zbagent_config['tlscafile'] != "none") {
 					$ca = lookup_ca($zbagent_config['tlscafile']);
-					zabbix_add_keyfile($ca['crt'], "ca");
+					zabbix_agent_add_keyfile($ca['crt'], "ca");
 					$TlsCAfile = "TLSCAFile=/usr/local/etc/zabbix3/zabbix_agentd.ca";
 				}
 			}
 
 			if ($zbagent_config['tlscrlfile'] != "none") {
 				$crl = lookup_crl($zbagent_config['tlscrlfile']);
 				crl_update($crl);
-				zabbix_add_keyfile($crl['text'], "crl-verify");
+				zabbix_agent_add_keyfile($crl['text'], "crl-verify");
 				$TlsCRLfile = "TLSCRLFile=/usr/local/etc/zabbix3/zabbix_agentd.crl-verify";
 			}
 
 			if ($zbagent_config['tlscertfile'] != "none") {
 				$cert = lookup_cert($zbagent_config['tlscertfile']);
 
-				zabbix_add_keyfile($cert['crt'], "cert");
+				zabbix_agent_add_keyfile($cert['crt'], "cert");
 				$TlsCERTfile = "TLSCertFile=/usr/local/etc/zabbix3/zabbix_agentd.cert";
 
-				zabbix_add_keyfile($cert['prv'], "key");
+				zabbix_agent_add_keyfile($cert['prv'], "key");
 				$TlsKEYfile = "TLSKeyFile=/usr/local/etc/zabbix3/zabbix_agentd.key";
 			}
 
@@ -168,7 +168,7 @@ function sync_package_zabbix_agent_lts() {
 			}
 
 			if (! empty($zbagent_config['tlspskfile']) ) {
-				zabbix_add_keyfile($zbagent_config['tlspskfile'], "psk");
+				zabbix_agent_add_keyfile($zbagent_config['tlspskfile'], "psk");
 				$TLSPSKFile = "TLSPSKFile=/usr/local/etc/zabbix3/zabbix_agentd.psk";
 			}
 
@@ -299,7 +299,7 @@ EOF;
 }
 
 // Based on openvpn_add_keyfile() function
-function zabbix_add_keyfile(& $data, $directive) {
+function zabbix_agent_add_keyfile(& $data, $directive) {
 
 	$fpath = "/usr/local/etc/zabbix3/zabbix_agentd.{$directive}";
 

diff --git a/net-mgmt/pfSense-pkg-zabbix-proxy/files/usr/local/pkg/zabbix-proxy-lts.inc b/net-mgmt/pfSense-pkg-zabbix-proxy/files/usr/local/pkg/zabbix-proxy-lts.inc
@@ -93,25 +93,25 @@ function sync_package_zabbix_proxy_lts() {
 			} else {
 				if ($zbproxy_config['tlscafile'] != "none") {
 					$ca = lookup_ca($zbproxy_config['tlscafile']);
-					zabbix_add_keyfile($ca['crt'], "ca");
+					zabbix_proxy_add_keyfile($ca['crt'], "ca");
 					$TlsCAfile = "TLSCAFile=/usr/local/etc/zabbix3/zabbix_proxy.ca";
 				}
 			}
 
 			if ($zbproxy_config['tlscrlfile'] != "none") {
 				$crl = lookup_crl($zbproxy_config['tlscrlfile']);
 				crl_update($crl);
-				zabbix_add_keyfile($crl['text'], "crl-verify");
+				zabbix_proxy_add_keyfile($crl['text'], "crl-verify");
 				$TlsCRLfile = "TLSCRLFile=/usr/local/etc/zabbix3/zabbix_proxy.crl-verify";
 			}
 
 			if ($zbproxy_config['tlscertfile'] != "none") {
 				$cert = lookup_cert($zbproxy_config['tlscertfile']);
 
-				zabbix_add_keyfile($cert['crt'], "cert");
+				zabbix_proxy_add_keyfile($cert['crt'], "cert");
 				$TlsCERTfile = "TLSCertFile=/usr/local/etc/zabbix3/zabbix_proxy.cert";
 
-				zabbix_add_keyfile($cert['prv'], "key");
+				zabbix_proxy_add_keyfile($cert['prv'], "key");
 				$TlsKEYfile = "TLSKeyFile=/usr/local/etc/zabbix3/zabbix_proxy.key";
 			}
 
@@ -120,7 +120,7 @@ function sync_package_zabbix_proxy_lts() {
 			}
 
 			if (! empty($zbproxy_config['tlspskfile']) ) {
-				zabbix_add_keyfile($zbproxy_config['tlspskfile'], "psk");
+				zabbix_proxy_add_keyfile($zbproxy_config['tlspskfile'], "psk");
 				$TLSPSKFile = "TLSPSKFile=/usr/local/etc/zabbix3/zabbix_proxy.psk";
 			}
 
@@ -266,7 +266,7 @@ EOF;
 }
 
 // Based on openvpn_add_keyfile() function
-function zabbix_add_keyfile(& $data, $directive) {
+function zabbix_proxy_add_keyfile(& $data, $directive) {
 
 	$fpath = "/usr/local/etc/zabbix3/zabbix_proxy.{$directive}";