Nominatim: search_country table got removed in April

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

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index d6c7806fd62fce386a0e5722a7a8fe590cf6db18..ada3b08f8658148aac2955ee1a02118ab76864a1 100644 (file)
--- a/cookbooks/accounts/recipes/default.rb
+++ b/cookbooks/accounts/recipes/default.rb
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 #
 # Cookbook Name:: accounts
 # Recipe:: default
 #
 # Cookbook Name:: accounts
 # Recipe:: default


@@ -9,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,


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

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

 
 administrators = []
 
 
 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}"
   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
 
 
     group_members = group_members.collect(&:to_s).sort
 


@@ -43,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"]