Merge pull request #39 from chromko/refactor_attrs

Add empty field checks for agent IP and PORT attributes
express42 · Jun 14, 2017 · 62969cd · 62969cd
2 parents e3f5ec7 + 57dd8d8
commit 62969cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/recipes/host.rb b/recipes/host.rb
@@ -27,7 +27,7 @@
   host_group    node['zabbix']['host']['group']
   use_ip        node['zabbix']['host']['agent']['use_ip']
   dns           node['zabbix']['host']['dns']
-  port          node['zabbix']['agent']['config']['listen_port']
+  port          node['zabbix']['agent']['config']['listen_port'] unless node['zabbix']['agent']['config']['listen_port'].to_s.empty?
   ip_address    node['zabbix']['host']['ipaddress']
 
   ipmi_enabled  node['zabbix']['host']['ipmi']['enabled']

diff --git a/templates/default/zabbix_agentd.conf.erb b/templates/default/zabbix_agentd.conf.erb
@@ -5,8 +5,12 @@
 
 # agent configuration options
 
+<% unless @listen_ip.to_s.empty? %>
 ListenIP=<%= @listen_ip %>
+<% end %>
+<% unless @listen_port.to_s.empty? %>
 ListenPort=<%= @listen_port %>
+<% end %>
 <% if node['platform'] != 'windows' %>
 PidFile=<%= @pidfile %>
 <% end %>