X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/307adfed3045a1673b09bccce74acaaf530d3c9b..d9be34b0a53af50682883eaa8f79f4ee46037c8e:/cookbooks/accounts/recipes/default.rb

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index d6c7806fd..b0110cf3c 100644
--- a/cookbooks/accounts/recipes/default.rb
+++ b/cookbooks/accounts/recipes/default.rb
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Cookbook Name:: accounts
 # Recipe:: default
@@ -18,9 +17,7 @@
 # limitations under the License.
 #
 
-package "zsh" do
-  action :install
-end
+package "zsh"
 
 administrators = []
 
@@ -31,7 +28,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_user_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
 
@@ -43,13 +40,11 @@ search(:accounts, "*:*").each do |account|
     end
 
     group name.to_s do
-      action :create
       gid account["uid"].to_i
       members group_members & node[:etc][:passwd].keys
     end
 
     user name.to_s do
-      action :create
       uid account["uid"].to_i
       gid account["uid"].to_i
       comment account["comment"] if account["comment"]