X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..711ff014c1eadd4a74fdc20ba5a300b5ed96e531:/cookbooks/rsyncd/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb index 6d4d6b763..8ab06a0e7 100644 --- 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 # -# 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, @@ -33,11 +33,11 @@ node[:rsyncd][:modules].each do |name, details| 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" @@ -51,7 +51,7 @@ template "/etc/default/rsync" do source "rsync.erb" owner "root" group "root" - mode 0644 + mode 0o644 notifies :restart, "service[rsync]" end @@ -59,7 +59,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