Merge remote-tracking branch 'github/pull/169'

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

diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb
index 56eb2f6ff64b2eb32588374cf23d54cb5a6d862b..8ab06a0e79656edab9eb2434c863fa3f3fb40ce4 100644 (file)
--- a/cookbooks/rsyncd/recipes/default.rb
+++ b/cookbooks/rsyncd/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,10 +19,10 @@
 
 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|
+node[:rsyncd][:modules].each do |name, details|

   hosts_allow[name] = details[:hosts_allow] || []
 
   if details[:nodes_allow]
   hosts_allow[name] = details[:hosts_allow] || []
 
   if details[:nodes_allow]


@@ -33,17 +33,17 @@ node[:rsyncd][:modules].each do |name,details|
 
   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
+  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
 end
 
 package "rsync"
 
 service "rsync" do

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

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


@@ -51,15 +51,15 @@ template "/etc/default/rsync" do
   source "rsync.erb"
   owner "root"
   group "root"
   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"
 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
 
   variables :hosts_allow => hosts_allow, :hosts_deny => hosts_deny
 end