X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..9f4108f00bbf23094f1607566dba2dccda5df314:/cookbooks/rsyncd/recipes/default.rb

diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb
index 5f090d1ce..b14e2f405 100644
--- a/cookbooks/rsyncd/recipes/default.rb
+++ b/cookbooks/rsyncd/recipes/default.rb
@@ -19,10 +19,31 @@
 
 include_recipe "networking"
 
+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_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
+end
+
 package "rsync"
 
 service "rsync" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true
 end
 
@@ -30,15 +51,16 @@ template "/etc/default/rsync" do
   source "rsync.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :restart, resources(:service => "rsync")
+  mode 0o644
+  notifies :restart, "service[rsync]"
 end
 
 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
 
 firewall_rule "accept-rsync" do