revamp: user/group handling

18 files changed, 17 insertions, 18 deletions

diff --git a/dan/ele-chromebook.yml b/dan/ele-chromebook.yml
index ad1c5936..411c49b7 100644
--- a/dan/ele-chromebook.yml
+++ b/dan/ele-chromebook.yml
@@ -12,7 +12,7 @@
   hosts: ele-chromebook
   roles:
   - role: ws/base
-  - role: core/admin-users
+  - role: core/users
   - role: ws/flatpak
   post_tasks:
   - name: install script to configure hdmi out
diff --git a/dan/ele-dione.yml b/dan/ele-dione.yml
index 52c9528d..95800036 100644
--- a/dan/ele-dione.yml
+++ b/dan/ele-dione.yml
@@ -12,7 +12,7 @@
 - name: Payload Setup
   hosts: ele-dione
   roles:
-  - role: core/admin-users
+  - role: core/users
   - role: storage/zfs/base
   - role: apt-repo/spreadspace
   - role: nginx/base
diff --git a/dan/ele-emcplayer.yml b/dan/ele-emcplayer.yml
index 91b1a555..0b9d7568 100644
--- a/dan/ele-emcplayer.yml
+++ b/dan/ele-emcplayer.yml
@@ -13,7 +13,7 @@
   hosts: "{{ install_hostname }}"
   roles:
   - role: ws/base
-  - role: core/admin-users
+  - role: core/users
   post_tasks:
   - name: generate play script
     copy:
diff --git a/dan/ele-hpws-maxi.yml b/dan/ele-hpws-maxi.yml
index a5c67366..1661de96 100644
--- a/dan/ele-hpws-maxi.yml
+++ b/dan/ele-hpws-maxi.yml
@@ -15,4 +15,4 @@
   - role: apt-repo/obs-studio
   - role: apt-repo/spreadspace
   - role: ws/base
-  - role: core/admin-users
+  - role: core/users
diff --git a/dan/ele-hpws-mini2.yml b/dan/ele-hpws-mini2.yml
index 800f3e8c..83341a64 100644
--- a/dan/ele-hpws-mini2.yml
+++ b/dan/ele-hpws-mini2.yml
@@ -14,7 +14,7 @@
   roles:
   - role: apt-repo/spreadspace
   - role: ws/base
-  - role: core/admin-users
+  - role: core/users
   post_tasks:
   - name: install chromium start script
     copy:
diff --git a/dan/ele-hyperion.yml b/dan/ele-hyperion.yml
index d2134382..3402de41 100644
--- a/dan/ele-hyperion.yml
+++ b/dan/ele-hyperion.yml
@@ -17,7 +17,7 @@
   - role: nginx/base
   - role: monitoring/prometheus/exporter
   - role: ws/base
-  - role: core/admin-users
+  - role: core/users
   - role: streaming/blackmagic/desktopvideo
   - role: streaming/blackmagic/mediaexpress
   - role: docker/engine
diff --git a/dan/ele-media.yml b/dan/ele-media.yml
index 5406c56a..d22f91dd 100644
--- a/dan/ele-media.yml
+++ b/dan/ele-media.yml
@@ -12,7 +12,7 @@
 - name: Payload Setup
   hosts: ele-media
   roles:
-  - role: core/admin-users
+  - role: core/users
   - role: storage/zfs/base
   - role: apt-repo/spreadspace
   - role: kubernetes/base
diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml
index c33ff5dc..f8f7f55a 100644
--- a/dan/ele-telesto.yml
+++ b/dan/ele-telesto.yml
@@ -12,7 +12,7 @@
 - name: Payload Setup
   hosts: ele-telesto
   roles:
-  - role: core/admin-users
+  - role: core/users
   - role: apt-repo/spreadspace
   - role: nginx/base
   - role: monitoring/prometheus/exporter
diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml
index e0775d23..a1a259d2 100644
--- a/dan/ele-thetys.yml
+++ b/dan/ele-thetys.yml
@@ -13,7 +13,7 @@
   hosts: ele-thetys
   roles:
   - role: storage/lvm/base
-  - role: core/admin-users
+  - role: core/users
   - role: apt-repo/spreadspace
   - role: nginx/base
   - role: monitoring/prometheus/exporter
diff --git a/dan/ele-tsdatacop.yml b/dan/ele-tsdatacop.yml
index 33787320..949bbba2 100644
--- a/dan/ele-tsdatacop.yml
+++ b/dan/ele-tsdatacop.yml
@@ -15,7 +15,7 @@
   - role: apt-repo/obs-studio
   - role: apt-repo/spreadspace
   - role: ws/base
-  - role: core/admin-users
+  - role: core/users
   - role: streaming/blackmagic/desktopvideo
   - role: streaming/blackmagic/mediaexpress
   post_tasks:
diff --git a/dan/ele-uhrturm.yml b/dan/ele-uhrturm.yml
index ff5f3332..2b102803 100644
--- a/dan/ele-uhrturm.yml
+++ b/dan/ele-uhrturm.yml
@@ -11,7 +11,6 @@
 - name: Payload Setup
   hosts: ele-uhrturm
   roles:
-  - role: core/admin-users
   - role: streaming/blackmagic/desktopvideo
   - role: apt-repo/spreadspace
   - role: docker/engine
diff --git a/dan/ele-ymir.yml b/dan/ele-ymir.yml
index d82c42cd..ac94cbee 100644
--- a/dan/ele-ymir.yml
+++ b/dan/ele-ymir.yml
@@ -16,7 +16,7 @@
   - role: nginx/base
   - role: monitoring/prometheus/exporter
   - role: ws/base
-  - role: core/admin-users
+  - role: core/users
   post_tasks:
   ## TODO: move to network/netplan when this is done
   - name: install vlan interfaces
diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml
index 525c2353..3d555ba5 100644
--- a/dan/sk-2019.yml
+++ b/dan/sk-2019.yml
@@ -7,7 +7,7 @@
   # - role: core/sshd/base
   # - role: core/zsh
   - role: core/cpu-microcode
-  # - role: core/admin-users
+  # - role: core/users
   - role: storage/luks/base
   - role: storage/zfs/base
   - role: apt-repo/spreadspace
diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml
index 3f1baedd..d7c42245 100644
--- a/dan/sk-2019vm.yml
+++ b/dan/sk-2019vm.yml
@@ -7,7 +7,7 @@
   - role: core/sshd/base
   - role: core/zsh
   - role: core/cpu-microcode
-  - role: core/admin-users
+  - role: core/users
   - role: storage/luks/base
   - role: storage/zfs/base
   - role: storage/zfs/sanoid
diff --git a/dan/sk-cloudio.yml b/dan/sk-cloudio.yml
index ba809fdf..244c771c 100644
--- a/dan/sk-cloudio.yml
+++ b/dan/sk-cloudio.yml
@@ -11,7 +11,7 @@
 - name: Payload Setup
   hosts: sk-cloudio
   roles:
-  - role: core/admin-users
+  - role: core/users
   - role: storage/zfs/base
   - role: apt-repo/spreadspace
   - role: storage/zfs/sanoid
diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml
index aa0a6abe..b8a6dc13 100644
--- a/dan/sk-tomnext-nc.yml
+++ b/dan/sk-tomnext-nc.yml
@@ -10,7 +10,7 @@
 - name: Payload Setup
   hosts: sk-tomnext-nc
   roles:
-  - role: core/admin-users
+  - role: core/users
   - role: storage/zfs/base
   - role: apt-repo/spreadspace
   - role: storage/zfs/sanoid
diff --git a/dan/sk-tomnext.yml b/dan/sk-tomnext.yml
index c643499f..8ad69918 100644
--- a/dan/sk-tomnext.yml
+++ b/dan/sk-tomnext.yml
@@ -7,7 +7,7 @@
   - role: core/sshd/base
   - role: core/zsh
   - role: core/cpu-microcode
-  - role: core/admin-users
+  - role: core/users
   - role: storage/luks/base
   - role: storage/zfs/base
   - role: storage/zfs/sanoid
diff --git a/dan/sk-torrent.yml b/dan/sk-torrent.yml
index cd29e91d..e6a176c1 100644
--- a/dan/sk-torrent.yml
+++ b/dan/sk-torrent.yml
@@ -6,5 +6,5 @@
   - role: core/base
   - role: core/sshd/base
   - role: core/zsh
-  - role: core/admin-users
+  - role: core/users
   - role: skillz/torrent