Merge pull request #50 from Firefishy/add-imagery

[chef.git] / cookbooks / rsyncd / recipes / default.rb

diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb
index 41eaee80a4549af1be7d6cd116337e2bb7826366..18eb23082249484f380d5f7e367aa5d71b15d293 100644 (file)
--- a/cookbooks/rsyncd/recipes/default.rb
+++ b/cookbooks/rsyncd/recipes/default.rb
@@ -19,31 +19,27 @@
 
 include_recipe "networking"
 
 
 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] || []
 
 
 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] || []
 
 
   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
 end
 
 package "rsync"
 
 service "rsync" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
 
   supports :status => true, :restart => true
 end