X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..56df259055ae541d1f31b8502c549cb84f74778e:/cookbooks/rsyncd/recipes/default.rb diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb index 5f090d1ce..18eb23082 100644 --- a/cookbooks/rsyncd/recipes/default.rb +++ b/cookbooks/rsyncd/recipes/default.rb @@ -19,10 +19,27 @@ include_recipe "networking" +hosts_allow = {} +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] + + hosts_deny[name] = details[:hosts_deny] || [] + + 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 @@ -31,7 +48,7 @@ template "/etc/default/rsync" do owner "root" group "root" mode 0644 - notifies :restart, resources(:service => "rsync") + notifies :restart, "service[rsync]" end template "/etc/rsyncd.conf" do @@ -39,6 +56,7 @@ template "/etc/rsyncd.conf" do owner "root" group "root" mode 0644 + variables :hosts_allow => hosts_allow, :hosts_deny => hosts_deny end firewall_rule "accept-rsync" do