Merge pull request #420 from sdadh01/master

Allow auto-conversion if either of node['apache']['listen_ports'] or …
sous-chefs · Apr 13, 2016 · a41e304 · a41e304
2 parents 2ff5c1f + 52372bb
commit a41e304
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libraries/listen.rb b/libraries/listen.rb
@@ -31,7 +31,7 @@ def merge_listen_attributes(node)
     private_class_method
 
     def self.converted_listen_ports_and_addresses(node)
-      return [] unless node['apache']['listen_ports'] && node['apache']['listen_addresses']
+      return [] unless node['apache']['listen_ports'] || node['apache']['listen_addresses']
       Chef::Log.warn "node['apache']['listen_ports'] and node['apache']['listen_addresses'] are deprecated in favor of node['apache']['listen']. Please adjust your cookbooks"
 
       node['apache']['listen_addresses'].uniq.each_with_object([]) do |address, listen|