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 6d4d6b7635bb14b46114ab0b6e825eff5c55c701..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,


@@ -33,11 +33,11 @@ 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"
 end
 
 package "rsync"


@@ -51,7 +51,7 @@ template "/etc/default/rsync" do
   source "rsync.erb"
   owner "root"
   group "root"
   source "rsync.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[rsync]"
 end
 
   notifies :restart, "service[rsync]"
 end
 


@@ -59,7 +59,7 @@ template "/etc/rsyncd.conf" do
   source "rsyncd.conf.erb"
   owner "root"
   group "root"
   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