From 2d65ef4d8320557bd8757d62ff7735d5b2bf0722 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 23 Mar 2016 09:46:24 +0100 Subject: [PATCH] Don't add TLS param if no encryption is enabled --- root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/85TLS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/85TLS b/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/85TLS index 0e31f1e..a9540eb 100644 --- a/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/85TLS +++ b/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/85TLS @@ -25,8 +25,8 @@ _EOF $OUT .= "TLSServerCertIssuer=$issuer\n" if ($issuer ne ''); $OUT .= "TLSServerCertSubject=$subject\n" if ($subject ne ''); } - my $encryptions = (scalar @encryptions > 0) ? join(',', @encryptions) : 'unencrypted'; - $OUT .=<<_EOF; + my $encryptions = (scalar @encryptions > 0) ? join(',', @encryptions) : ''; + $OUT .=<<_EOF if ($encryptions ne ''); TLSConnect=$encryptions TLSAccept=$encryptions _EOF