X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace..5f3a5421476c68027c50b821916585ab01f0efa1:/cookbooks/accounts/recipes/default.rb?ds=inline diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb index bdb01eb9e..b395aeca6 100644 --- a/cookbooks/accounts/recipes/default.rb +++ b/cookbooks/accounts/recipes/default.rb @@ -1,15 +1,14 @@ -# -*- coding: utf-8 -*- # -# Cookbook Name:: accounts +# Cookbook:: accounts # Recipe:: default # -# Copyright 2010, OpenStreetMap Foundation +# Copyright:: 2010, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # 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, @@ -18,11 +17,9 @@ # limitations under the License. # -package "zsh" do - action :install -end +package "zsh" -administrators = [] +administrators = node[:accounts][:administrators].to_a search(:accounts, "*:*").each do |account| name = account["id"] @@ -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_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 @@ -42,20 +39,24 @@ search(:accounts, "*:*").each do |account| user_shell = details[:shell] || account["shell"] || node[:accounts][:shell] end + available_users = if node[:etc] + node[:etc][:passwd].keys + else + [] + end + group name.to_s do - action :create gid account["uid"].to_i - members group_members & node[:etc][:passwd].keys + members group_members & available_users end user name.to_s do - action :create uid account["uid"].to_i gid account["uid"].to_i 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 @@ -63,24 +64,20 @@ search(:accounts, "*:*").each do |account| source name.to_s owner name.to_s group name.to_s - mode 0755 + mode "755" files_owner name.to_s files_group name.to_s - files_mode 0644 + files_mode "644" only_if do - begin - cookbook = run_context.cookbook_collection[cookbook_name] - files = cookbook.relative_filenames_in_preferred_directory(node, :files, name.to_s) - !files.empty? - rescue Chef::Exceptions::FileNotFound - false - end + cookbook = run_context.cookbook_collection[cookbook_name] + files = cookbook.relative_filenames_in_preferred_directory(node, :files, name.to_s) + !files.empty? + rescue Chef::Exceptions::FileNotFound + false 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