From a3d61369c44e5991cf0d003927c05b23bb7aa7ee Mon Sep 17 00:00:00 2001 From: A1EF Date: Sat, 31 Oct 2020 21:07:38 +0300 Subject: [PATCH 1/2] change key_type max length from 7 to 11 --- manifests/manage.pp | 2 +- manifests/params.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/manage.pp b/manifests/manage.pp index 5ce7698..3164681 100644 --- a/manifests/manage.pp +++ b/manifests/manage.pp @@ -15,7 +15,7 @@ Struct[{ key => String[1, default], key_label => String[1, default], - key_type => String[7, 7], + key_type => String[7, 11], }] ], }] $userdata diff --git a/manifests/params.pp b/manifests/params.pp index d78ba9e..3140cd7 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -32,7 +32,7 @@ Struct[{ key => String[1, default], key_label => String[1, default], - key_type => String[7, 7], + key_type => String[7, 11], }] ], }] From d362c1632155eb6c5e807540046289a504b8527b Mon Sep 17 00:00:00 2001 From: A1EF Date: Sat, 31 Oct 2020 21:12:24 +0300 Subject: [PATCH 2/2] add possibility to manage users shell --- manifests/manage.pp | 6 +++++- manifests/params.pp | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/manage.pp b/manifests/manage.pp index 3164681..ea7d7b9 100644 --- a/manifests/manage.pp +++ b/manifests/manage.pp @@ -10,6 +10,7 @@ ], managehome => Boolean, password => Optional[String[0, default]], + shell => Optional[String[2, default]], present => Boolean, ssh => Optional[ Struct[{ @@ -35,7 +36,10 @@ false => $userdata['password'], true => '', }, - shell => '/bin/bash', + shell => empty($userdata['shell']) ? { + false => $userdata['shell'], + true => '/bin/bash', + }, groups => empty($userdata['groups']) ? { false => $userdata['groups'], true => [], diff --git a/manifests/params.pp b/manifests/params.pp index 3140cd7..53b6516 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -27,6 +27,7 @@ ], managehome => Boolean, password => Optional[String[0, default]], + shell => Optional[String[2, default]], present => Boolean, ssh => Optional[ Struct[{