Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/puppet/parser/functions/accounts_group_members.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ module Puppet::Parser::Functions
# assign `user` to group `g`
assign_helper = lambda do |res, g, user|
unless res.key?(g) # create group if not defined yet
res[g] = {'members' => [], 'require' => []}
res[g] = {'members' => [], 'before' => []}
else
res[g]['members'] = [] unless res[g].key?('members')
res[g]['require'] = [] unless res[g].key?('require')
res[g]['before'] = [] unless res[g].key?('before')
end
unless user.nil?
res[g]['members'] << user unless res[g]['members'].include? user
res[g]['require'] << "User[#{user}]"
res[g]['before'] << "User[#{user}]"
end
end

Expand Down
2 changes: 2 additions & 0 deletions manifests/group.pp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
$members = [],
$gid = undef,
$auth_membership = true,
$forcelocal = false,
) {

validate_re($ensure, [ '^absent$', '^present$' ],
Expand All @@ -35,5 +36,6 @@
'gid' => $gid,
'members' => sort(unique($members)),
'auth_membership' => $auth_membership,
'forcelocal' => $forcelocal,
})
}
11 changes: 7 additions & 4 deletions manifests/user.pp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
# Should not be changed unless you're moving out of user's home.
# * [ssh_dir_group] (default: `user`) owner of `.ssh` directory (and `authorized_keys` file in the directory).
# * [manage_ssh_dir] Whether `.ssh` directory should be managed by this module (default: `true`)
# * [forcelocal] (optional, default false) Forces the management of local accounts
#
define accounts::user(
$uid = undef,
Expand Down Expand Up @@ -72,6 +73,7 @@
$allowdupe = false,
$home_permissions = '0700',
$manage_ssh_dir = true,
$forcelocal = false,
$ssh_dir_owner = undef,
$ssh_dir_group = undef,
) {
Expand Down Expand Up @@ -194,10 +196,11 @@
}

user { $username:
ensure => present,
uid => $uid,
shell => $shell,
allowdupe => $allowdupe,
ensure => present,
uid => $uid,
shell => $shell,
allowdupe => $allowdupe,
forcelocal => $forcelocal,
}

# Set password if available
Expand Down
24 changes: 12 additions & 12 deletions spec/functions/accounts_group_members_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@

is_expected.to run.with_params(users, {}).and_return(
{
'sudo' => {'members' => [:foo], 'require'=> ['User[foo]']},
'bar' => {'members' => [:john],'require'=> ['User[john]']},
'users' => {'members' => [:foo,:john], 'require'=> ['User[foo]','User[john]']},
'foo' => {'members' => [], 'require' => []},
'john' => {'members' => [], 'require' => []},
'sudo' => {'members' => [:foo], 'before'=> ['User[foo]']},
'bar' => {'members' => [:john],'before'=> ['User[john]']},
'users' => {'members' => [:foo,:john], 'before'=> ['User[foo]','User[john]']},
'foo' => {'members' => [], 'before' => []},
'john' => {'members' => [], 'before' => []},
}
)
end
Expand All @@ -50,12 +50,12 @@

is_expected.to run.with_params(users, {}).and_return(
{
'alice' => {'members' => [], 'require'=> []},
'bob' => {'members' => [], 'require'=> []},
'sudo' => {'members' => [:bob], 'require'=> ['User[bob]']},
'alice' => {'members' => [], 'before'=> []},
'bob' => {'members' => [], 'before'=> []},
'sudo' => {'members' => [:bob], 'before'=> ['User[bob]']},
'users' => {
'members' => [:alice,:bob],
'require'=> ['User[alice]', 'User[bob]']
'before'=> ['User[alice]', 'User[bob]']
},
}
)
Expand All @@ -69,19 +69,19 @@
}

is_expected.to run.with_params(users, {}).and_return(
{'testgroup' => {'members' => [], 'require' => []}}
{'testgroup' => {'members' => [], 'before' => []}}
)
end

it 'finds group with gid' do
users = {
foo: { 'primary_group' => 'testgroup',
'manage_group' => true, 'gid' => 123,
'require' => []},
'before' => []},
}

is_expected.to run.with_params(users, {}).and_return(
{"testgroup"=>{"members"=>[], "require"=>[], "gid"=>123}}
{"testgroup"=>{"members"=>[], "before"=>[], "gid"=>123}}
)
end
end
Expand Down