Skip to content

Commit fef3e43

Browse files
committed
Change SSH key file generation to use user primary group by default
1 parent 37f1cf0 commit fef3e43

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## 0.2.0 (2020-09-18)
4+
5+
- Change SSH key file generation to use user primary group by default
6+
37
## 0.1.0 (2020-07-10)
48

59
- Initial release

libraries/general.rb

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#
55
# Copyright:: Ben Hughes <bmhughes@bmhughes.co.uk>, All Rights Reserved.
66

7+
require 'etc'
8+
79
module UserSsh
810
module Cookbook
911
module GeneralHelpers
@@ -22,6 +24,19 @@ def user_ssh_file
2224
end
2325
end
2426

27+
def user_primary_group(user)
28+
raise_error(type: ArgumentError) unless user.is_a?(String) || user.is_a?(Integer)
29+
30+
user_passwd = case user
31+
when String
32+
Etc.getpwnam(user)
33+
when Integer
34+
Etc.getpwuid(user)
35+
end
36+
37+
Etc.getgrgid(user_passwd.gid).name
38+
end
39+
2540
def comment_default
2641
return comment unless nil_or_empty?(comment)
2742
return name unless nil_or_empty?(name)

metadata.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
maintainer_email 'bmhughes@bmhughes.co.uk'
44
license 'Apache-2.0'
55
description 'Configures user SSH keys and options'
6-
version '0.1.0'
7-
chef_version '>= 14.0'
6+
version '0.2.0'
7+
chef_version '>= 16.0'
88

99
issues_url 'https://github.com/bmhughes/user_ssh/issues'
1010
source_url 'https://github.com/bmhughes/user_ssh'

resources/_user_ssh.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
description: 'Owner of the generated file'
2828

2929
property :group, [Integer, String],
30-
default: lazy { user },
30+
default: lazy { user_primary_group(user) },
3131
description: 'Group of the generated file'
3232

3333
property :mode, String,

0 commit comments

Comments
 (0)