X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..388a527fdf388cd5383b978d0cb5406d787b8661:/cookbooks/rsyncd/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb index 41eaee80a..b14e2f405 100644 --- a/cookbooks/rsyncd/recipes/default.rb +++ b/cookbooks/rsyncd/recipes/default.rb @@ -19,8 +19,8 @@ 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] || [] @@ -33,17 +33,17 @@ node[:rsyncd][:modules].each do |name, details| 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 + next unless details[:nodes_deny] + + hosts_deny[name] |= search(:node, details[:nodes_deny]).collect do |n| + n.ipaddresses(:role => :external) + end.flatten end package "rsync" service "rsync" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true end @@ -51,7 +51,7 @@ template "/etc/default/rsync" do source "rsync.erb" owner "root" group "root" - mode 0644 + mode 0o644 notifies :restart, "service[rsync]" end @@ -59,7 +59,7 @@ template "/etc/rsyncd.conf" do source "rsyncd.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :hosts_allow => hosts_allow, :hosts_deny => hosts_deny end