Revert "Don't include the networking recipe"

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

diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb
index 44fef331e032bfb95744cff19ea390e9905ca765..deaf9a0d26132cff92f4bbcfee8355e359d046da 100644 (file)
--- 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|
+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
 
@@ -51,7 +47,7 @@ template "/etc/default/rsync" do
   source "rsync.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[rsync]"
 end
 
@@ -59,7 +55,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