Merge remote-tracking branch 'github/pull/459'

[chef.git] / cookbooks / accounts / recipes / default.rb

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index 586d59004a2e463ef94a7ad9fd17394e2ded1326..b395aeca615c44f3bb46546c2610e27f076fb031 100644 (file)
--- a/cookbooks/accounts/recipes/default.rb
+++ b/cookbooks/accounts/recipes/default.rb
@@ -19,7 +19,7 @@
 
 package "zsh"
 
 
 package "zsh"
 

-administrators = []
+administrators = node[:accounts][:administrators].to_a

 
 search(:accounts, "*:*").each do |account|
   name = account["id"]
 
 search(:accounts, "*:*").each do |account|
   name = account["id"]


@@ -67,7 +67,7 @@ search(:accounts, "*:*").each do |account|
       mode "755"
       files_owner name.to_s
       files_group name.to_s
       mode "755"
       files_owner name.to_s
       files_group name.to_s

-      files_mode 0o644
+      files_mode "644"

       only_if do
         cookbook = run_context.cookbook_collection[cookbook_name]
         files = cookbook.relative_filenames_in_preferred_directory(node, :files, name.to_s)
       only_if do
         cookbook = run_context.cookbook_collection[cookbook_name]
         files = cookbook.relative_filenames_in_preferred_directory(node, :files, name.to_s)