X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/261e7e9cd1a9882faa4ed7087b5902ebafe25988..fb1f1d56e8d8a6a86b79c71546e6c114fec2640c:/cookbooks/rsyncd/recipes/default.rb diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb index 44fef331e..18eb23082 100644 --- a/cookbooks/rsyncd/recipes/default.rb +++ b/cookbooks/rsyncd/recipes/default.rb @@ -19,31 +19,27 @@ include_recipe "networking" -hosts_allow = Hash.new -hosts_deny = Hash.new +hosts_allow = {} +hosts_deny = {} -node[:rsyncd][:modules].each do |name,details| +node[:rsyncd][:modules].each do |name, details| hosts_allow[name] = details[:hosts_allow] || [] - if details[:nodes_allow] - hosts_allow[name] |= search(:node, details[:nodes_allow]).collect do |n| - n.ipaddresses(:role => :external) - end.flatten - end + hosts_allow[name] |= search(:node, details[:nodes_allow]).collect do |n| + n.ipaddresses(:role => :external) + end.flatten if details[:nodes_allow] hosts_deny[name] = details[:hosts_deny] || [] - if details[:nodes_deny] - hosts_deny[name] |= search(:node, details[:nodes_deny]).collect do |n| - n.ipaddresses(:role => :external) - end.flatten - end + hosts_deny[name] |= search(:node, details[:nodes_deny]).collect do |n| + n.ipaddresses(:role => :external) + end.flatten if details[:nodes_deny] end package "rsync" service "rsync" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true end