From c17fccec08689065c8f4f902544e984521c7437b Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 22 Apr 2024 19:53:43 +0200 Subject: revamp: user/group handling --- inventory/group_vars/all/vars.yml | 12 ++++++++++-- inventory/group_vars/chaos-at-home/vars.yml | 3 --- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'inventory/group_vars') diff --git a/inventory/group_vars/all/vars.yml b/inventory/group_vars/all/vars.yml index f72f71ef..03bce8d5 100644 --- a/inventory/group_vars/all/vars.yml +++ b/inventory/group_vars/all/vars.yml @@ -12,11 +12,19 @@ ssh_users_root: ssh_keys_root: "{{ ssh_users_root | default([]) | map('extract', users) | map(attribute='ssh') | flatten | list }}" ssh_keys_root_extra: [] +## to be overriden in host_vars +normal_users_host: [] admin_users_host: [] -sshd_allowusers_host: "{{ admin_users_host }}" +sshd_allowusers_host: "{{ normal_users_host | union(admin_users_host) }}" +normal_groups_host: {} +system_groups_host: {} +## to be overriden in group_vars +normal_users_group: [] admin_users_group: [] -sshd_allowusers_group: "{{ admin_users_group }}" +sshd_allowusers_group: "{{ normal_users_group | union(admin_users_group) }}" +normal_groups_group: {} +system_groups_group: {} apt_repo_provider: default diff --git a/inventory/group_vars/chaos-at-home/vars.yml b/inventory/group_vars/chaos-at-home/vars.yml index 1dda9cb0..316d28a3 100644 --- a/inventory/group_vars/chaos-at-home/vars.yml +++ b/inventory/group_vars/chaos-at-home/vars.yml @@ -1,9 +1,6 @@ --- zsh_banner: chaos-at-home -admin_users_group: - - equinox - acme_account_email: admin@chaos-at-home.org apt_repo_provider: anexia -- cgit v1.2.3