X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..33eef04ba4e72c8c020ade293003b77fc76d0083:/cookbooks/accounts/recipes/default.rb diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb index 545ef7c9f..e043d9e3e 100644 --- a/cookbooks/accounts/recipes/default.rb +++ b/cookbooks/accounts/recipes/default.rb @@ -31,7 +31,7 @@ search(:accounts, "*:*").each do |account| if details[:status] group_members = details[:members] || account["members"] || [] user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}" - manage_home = details[:manage_home] || account["manage_home"] || node[:accounts][:manage_home] + manage_user_home = details[:manage_home] || account["manage_home"] || node[:accounts][:manage_home] group_members = group_members.collect(&:to_s).sort @@ -55,7 +55,7 @@ search(:accounts, "*:*").each do |account| comment account["comment"] if account["comment"] home user_home shell user_shell - supports :manage_home => manage_home + manage_home manage_user_home end remote_directory "/home/#{name}" do @@ -63,15 +63,15 @@ search(:accounts, "*:*").each do |account| source name.to_s owner name.to_s group name.to_s - mode 0755 + mode 0o755 files_owner name.to_s files_group name.to_s - files_mode 0644 + files_mode 0o644 only_if do begin cookbook = run_context.cookbook_collection[cookbook_name] files = cookbook.relative_filenames_in_preferred_directory(node, :files, name.to_s) - not files.empty? + !files.empty? rescue Chef::Exceptions::FileNotFound false end