major refactoring of users database

26 files changed, 93 insertions, 115 deletions

diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index 868eebde..335d1b77 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -18,10 +18,8 @@ network:
 
 base_modules_blacklist: "{{ base_modules_blacklist_none }}"
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 apt_repo_components:
   - main
diff --git a/inventory/host_vars/ch-hroottest.yml b/inventory/host_vars/ch-hroottest.yml
index 5de56794..e074afbb 100644
--- a/inventory/host_vars/ch-hroottest.yml
+++ b/inventory/host_vars/ch-hroottest.yml
@@ -11,9 +11,9 @@ network: {}
 
 
 apt_repo_components:
-- main
-- contrib  ## for zfs
-- non-free ## for microcode updates
+  - main
+  - contrib  ## for zfs
+  - non-free ## for microcode updates
 
 
 zfs_arc_size:
diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index cebf5764..368ac94a 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -17,14 +17,12 @@ network:
     gateway: "{{ network_zones.lan.gateway }}"
 
 base_packages_extra_host:
-- exfat-fuse
-- exfat-utils
-- vlan
+  - exfat-fuse
+  - exfat-utils
+  - vlan
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 docker_lvm:
   vg: "{{ host_name }}"
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index 4a372119..b5b74ff2 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -17,14 +17,12 @@ network:
     gateway: "{{ network_zones.lan.gateway }}"
 
 base_packages_extra_host:
-- exfat-fuse
-- exfat-utils
-- vlan
+  - exfat-fuse
+  - exfat-utils
+  - vlan
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 docker_lvm:
   vg: "{{ host_name }}"
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index cffc462b..bf638639 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -19,10 +19,8 @@ dyndns:
   server: ch-pan
 
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 
 nginx_pkg_variant: nginx
diff --git a/inventory/host_vars/ele-mur.yml b/inventory/host_vars/ele-mur.yml
index db1d90a2..15eff702 100644
--- a/inventory/host_vars/ele-mur.yml
+++ b/inventory/host_vars/ele-mur.yml
@@ -1,5 +1,7 @@
 ---
-ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.datacop }}"
+ssh_users_root:
+  - equinox
+  - datacop
 
 apt_repo_provider: ffgraz
 
diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml
index c491b90e..fdcb66ca 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/inventory/host_vars/ele-router.yml
@@ -1,5 +1,7 @@
 ---
-ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.datacop }}"
+ssh_users_root:
+  - equinox
+  - datacop
 
 wireguard_keys:
   gwhetzner:
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index 7e26d4ac..7ac794a5 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -14,7 +14,5 @@ network:
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
     gateway: "{{ network_zones.lan.gateway }}"
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 51dcf1a0..5748333f 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -15,10 +15,8 @@ network:
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
     gateway: "{{ network_zones.lan.gateway }}"
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 docker_pkg_provider: docker-com
 docker_pkg_name: docker-ce
diff --git a/inventory/host_vars/ele-tub.yml b/inventory/host_vars/ele-tub.yml
index 6a8e1dca..2655a98f 100644
--- a/inventory/host_vars/ele-tub.yml
+++ b/inventory/host_vars/ele-tub.yml
@@ -1,5 +1,7 @@
 ---
-ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.datacop }}"
+ssh_users_root:
+  - equinox
+  - datacop
 
 openwrt_variant: openwrt
 openwrt_release: 19.07.1
diff --git a/inventory/host_vars/ele-uhrturm.yml b/inventory/host_vars/ele-uhrturm.yml
index 342f7077..ad0056b0 100644
--- a/inventory/host_vars/ele-uhrturm.yml
+++ b/inventory/host_vars/ele-uhrturm.yml
@@ -12,7 +12,9 @@ network:
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
     gateway: "{{ network_zones.lan.gateway }}"
 
-ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.datacop }}"
+ssh_users_root:
+  - equinox
+  - datacop
 
 docker_pkg_provider: docker-com
 docker_pkg_name: docker-ce
diff --git a/inventory/host_vars/lw-dione.yml b/inventory/host_vars/lw-dione.yml
index 6beb2ee0..19b44ff4 100644
--- a/inventory/host_vars/lw-dione.yml
+++ b/inventory/host_vars/lw-dione.yml
@@ -18,14 +18,12 @@ network:
     gateway: 192.168.32.254
 
 base_packages_extra_host:
-- exfat-fuse
-- exfat-utils
-- vlan
+  - exfat-fuse
+  - exfat-utils
+  - vlan
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 docker_lvm:
   vg: "{{ host_name }}"
diff --git a/inventory/host_vars/lw-helene.yml b/inventory/host_vars/lw-helene.yml
index 404efd99..c5a936d5 100644
--- a/inventory/host_vars/lw-helene.yml
+++ b/inventory/host_vars/lw-helene.yml
@@ -18,14 +18,12 @@ network:
     gateway: 192.168.32.254
 
 base_packages_extra_host:
-- exfat-fuse
-- exfat-utils
-- vlan
+  - exfat-fuse
+  - exfat-utils
+  - vlan
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 docker_lvm:
   vg: "{{ host_name }}"
diff --git a/inventory/host_vars/lw-telesto.yml b/inventory/host_vars/lw-telesto.yml
index 25b0c403..f25ad258 100644
--- a/inventory/host_vars/lw-telesto.yml
+++ b/inventory/host_vars/lw-telesto.yml
@@ -15,7 +15,5 @@ network:
     mask: 255.255.255.0
     gateway: 192.168.32.254
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml
index 356633df..75aa41f0 100644
--- a/inventory/host_vars/lw-thetys.yml
+++ b/inventory/host_vars/lw-thetys.yml
@@ -15,10 +15,8 @@ network:
     mask: "255.255.255.0"
     gateway: "192.168.28.254"
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 docker_pkg_provider: docker-com
 docker_pkg_name: docker-ce
diff --git a/inventory/host_vars/r3-cccamp19-dione.yml b/inventory/host_vars/r3-cccamp19-dione.yml
index b674aeb1..47195b1f 100644
--- a/inventory/host_vars/r3-cccamp19-dione.yml
+++ b/inventory/host_vars/r3-cccamp19-dione.yml
@@ -12,9 +12,7 @@ network:
 
 
 base_packages_extra_host:
-- vlan
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+  - vlan
 
 dyndns:
   server: ch-pan
diff --git a/inventory/host_vars/r3-cccamp19-helene.yml b/inventory/host_vars/r3-cccamp19-helene.yml
index af3895ec..104a5eda 100644
--- a/inventory/host_vars/r3-cccamp19-helene.yml
+++ b/inventory/host_vars/r3-cccamp19-helene.yml
@@ -12,9 +12,7 @@ network:
 
 
 base_packages_extra_host:
-- vlan
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+  - vlan
 
 dyndns:
   server: ch-pan
diff --git a/inventory/host_vars/s2-calypso.yml b/inventory/host_vars/s2-calypso.yml
index 8105a76b..c9512432 100644
--- a/inventory/host_vars/s2-calypso.yml
+++ b/inventory/host_vars/s2-calypso.yml
@@ -1,10 +1,8 @@
 ---
 base_packages_extra_host:
-- exfat-fuse
-- exfat-utils
-- vlan
+  - exfat-fuse
+  - exfat-utils
+  - vlan
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
diff --git a/inventory/host_vars/s2-dione.yml b/inventory/host_vars/s2-dione.yml
index 7a2e4a92..2ae39b24 100644
--- a/inventory/host_vars/s2-dione.yml
+++ b/inventory/host_vars/s2-dione.yml
@@ -12,14 +12,12 @@ network:
 
 
 base_packages_extra_host:
-- exfat-fuse
-- exfat-utils
-- vlan
+  - exfat-fuse
+  - exfat-utils
+  - vlan
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 docker_lvm:
   vg: "{{ host_name }}"
diff --git a/inventory/host_vars/s2-helene.yml b/inventory/host_vars/s2-helene.yml
index c5b4fea3..4746dd7a 100644
--- a/inventory/host_vars/s2-helene.yml
+++ b/inventory/host_vars/s2-helene.yml
@@ -12,14 +12,12 @@ network:
 
 
 base_packages_extra_host:
-- exfat-fuse
-- exfat-utils
-- vlan
+  - exfat-fuse
+  - exfat-utils
+  - vlan
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
 
 docker_lvm:
   vg: "{{ host_name }}"
diff --git a/inventory/host_vars/s2-telesto.yml b/inventory/host_vars/s2-telesto.yml
index 13e2e050..20c3d55a 100644
--- a/inventory/host_vars/s2-telesto.yml
+++ b/inventory/host_vars/s2-telesto.yml
@@ -2,11 +2,9 @@
 base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
 
 base_packages_extra_host:
-- exfat-fuse
-- exfat-utils
-- vlan
+  - exfat-fuse
+  - exfat-utils
+  - vlan
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml
index 8105a76b..c9512432 100644
--- a/inventory/host_vars/s2-thetys.yml
+++ b/inventory/host_vars/s2-thetys.yml
@@ -1,10 +1,8 @@
 ---
 base_packages_extra_host:
-- exfat-fuse
-- exfat-utils
-- vlan
+  - exfat-fuse
+  - exfat-utils
+  - vlan
 
-admin_user_host:
-- "{{ equinox_user }}"
-
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
+admin_users_host:
+  - equinox
diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml
index f54d852f..ec3d4e80 100644
--- a/inventory/host_vars/sk-2019.yml
+++ b/inventory/host_vars/sk-2019.yml
@@ -10,13 +10,13 @@ install:
 network: {}
 
 base_intel_nic_stability_fix: true
-ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan  + ssh_keys.brt }}"
-ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
-
-
-admin_user_host:
-- "{{ brt_user }}"
+ssh_users_root:
+  - equinox
+  - dan
+  - brt
 
+admin_users_host:
+  - brt
 
 
 cryptdisk_volumes:
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index 705ff929..e989e951 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -10,12 +10,14 @@ install:
 network: {}
 
 base_intel_nic_stability_fix: true
-ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan }}"
+ssh_users_root:
+  - equinox
+  - dan
 
 apt_repo_components:
-- main
-- contrib  ## for zfs
-- non-free ## for microcode updates
+  - main
+  - contrib  ## for zfs
+  - non-free ## for microcode updates
 
 
 cryptdisk_volumes:
diff --git a/inventory/host_vars/sk-tomnext-hp.yml b/inventory/host_vars/sk-tomnext-hp.yml
index 72f116b9..cfa26218 100644
--- a/inventory/host_vars/sk-tomnext-hp.yml
+++ b/inventory/host_vars/sk-tomnext-hp.yml
@@ -15,7 +15,7 @@ install:
   interfaces:
   - bridge: br-public
     name: primary0
-    autostart: True
+  autostart: True
 
 network:
   nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml
index 22a96897..331126ba 100644
--- a/inventory/host_vars/sk-tomnext.yml
+++ b/inventory/host_vars/sk-tomnext.yml
@@ -10,12 +10,14 @@ install:
 network: {}
 
 base_intel_nic_stability_fix: true
-ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.dan }}"
+ssh_users_root:
+  - equinox
+  - dan
 
 apt_repo_components:
-- main
-- contrib  ## for zfs
-- non-free ## for microcode updates
+  - main
+  - contrib  ## for zfs
+  - non-free ## for microcode updates
 
 
 cryptdisk_volumes: