From 236f3dd536455a2c6fa9e0cb36e261b6e54fe570 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Tue, 10 Dec 2019 04:21:40 -0500 Subject: formalize 'packagers' and 'commiters' roles --- bin/ssh-list-authorized-keys | 2 +- parabola-hackers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ssh-list-authorized-keys b/bin/ssh-list-authorized-keys index 9b2d795..7edde96 100755 --- a/bin/ssh-list-authorized-keys +++ b/bin/ssh-list-authorized-keys @@ -31,7 +31,7 @@ ssh_users = all_users.select do | user | user_login = user['username'] user_groups = user['groups' ] user_keys = user['ssh_keys'] - has_shell_access = query_logins.include? user_login + has_shell_access = (query_logins.include? user_login) && (user_groups.include? 'ssh') has_push_access = ! (query_groups & user_groups).empty? has_ssh_key = ! user_keys.nil? diff --git a/parabola-hackers.yml b/parabola-hackers.yml index e2eef55..541f8ed 100644 --- a/parabola-hackers.yml +++ b/parabola-hackers.yml @@ -13,7 +13,6 @@ groupgroups: - administrators - committers - email - - keyring-trusted - packagers trustedusers: - keyring-secondary @@ -27,6 +26,7 @@ groupgroups: committers: - git packagers: + - keyring-trusted - repo # Groups that are have associated system users that can be SSH'ed into. -- cgit v1.2.2