X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..810efa014aa370e5f828d7fb9f33cb9e22de56e2:/cookbooks/accounts/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index 8ed05ff59..c6424b3ed 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.fetch(:manage_home, account.fetch("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
@@ -78,9 +78,7 @@ search(:accounts, "*:*").each do |account|
       end
     end
 
-    if details[:status] == "administrator"
-      administrators.push(name.to_s)
-    end
+    administrators.push(name.to_s) if details[:status] == "administrator"
   else
     user name.to_s do
       action :remove