summaryrefslogtreecommitdiff
path: root/inventory
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2024-04-22 19:53:43 +0200
committerChristian Pointner <equinox@spreadspace.org>2024-04-22 19:53:43 +0200
commitc17fccec08689065c8f4f902544e984521c7437b (patch)
tree762e7e346682fefa054e69391bdb85ba6f8f76b0 /inventory
parentch-apps: upgrade whawty-auth to latest release (diff)
revamp: user/group handling
Diffstat (limited to 'inventory')
-rw-r--r--inventory/group_vars/all/vars.yml12
-rw-r--r--inventory/group_vars/chaos-at-home/vars.yml3
2 files changed, 10 insertions, 5 deletions
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