X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..e7db69a4c74ce9e98992d538a552524880eb85a2:/cookbooks/rsyncd/recipes/default.rb diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb index deaf9a0d2..8ab06a0e7 100644 --- a/cookbooks/rsyncd/recipes/default.rb +++ b/cookbooks/rsyncd/recipes/default.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -25,15 +25,19 @@ hosts_deny = {} node[:rsyncd][:modules].each do |name, details| hosts_allow[name] = details[:hosts_allow] || [] - hosts_allow[name] |= search(:node, details[:nodes_allow]).collect do |n| - n.ipaddresses(:role => :external) - end.flatten if details[:nodes_allow] + if details[:nodes_allow] + hosts_allow[name] |= search(:node, details[:nodes_allow]).collect do |n| + n.ipaddresses(:role => :external) + end.flatten + end hosts_deny[name] = details[:hosts_deny] || [] + next unless details[:nodes_deny] + hosts_deny[name] |= search(:node, details[:nodes_deny]).collect do |n| n.ipaddresses(:role => :external) - end.flatten if details[:nodes_deny] + end.flatten end package "rsync"