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

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

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index 76c3a84609b1cfce337f0d900a972f85f152a1cb..ada3b08f8658148aac2955ee1a02118ab76864a1 100644 (file)
--- a/cookbooks/accounts/recipes/default.rb
+++ b/cookbooks/accounts/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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,9 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-package "zsh" do
-  action :install
-end
+package "zsh"

 
 administrators = []
 
 
 administrators = []
 


@@ -42,13 +40,11 @@ search(:accounts, "*:*").each do |account|
     end
 
     group name.to_s do
     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
       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"]
       uid account["uid"].to_i
       gid account["uid"].to_i
       comment account["comment"] if account["comment"]