X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..56df259055ae541d1f31b8502c549cb84f74778e:/cookbooks/rsyncd/recipes/default.rb diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb index 41eaee80a..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| 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