From 2d5e8089312b0d00a7d0c2dcdb3710576080c9c7 Mon Sep 17 00:00:00 2001
From: pneerincx <pieter.neerincx@gmail.com>
Date: Wed, 13 Mar 2019 17:30:21 +0100
Subject: [PATCH] Bugfixes for creating local regular users on Hyperchicken
 (tested on UI).

---
 group_vars/all/vars.yml                  |  7 +++++++
 group_vars/hyperchicken-cluster/vars.yml | 12 ++++++------
 local_regular_users.yml                  | 20 ++++++++++----------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 2b0755b39..07d312753 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -95,6 +95,11 @@ auth_users:
     uid: 1016
     pub_keys: |
               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKOKgVel0GbF67zZaVR0TFo82e5XeZOP1e3Ld3gIdaER h.j.zilverberg
+  envsync:
+    comment: 'Environment Synchronizer'
+    uid: 1017
+    pub_keys: |
+              # No direct logins required: sudo only.
 #
 # Local group specs.
 # Note:
@@ -109,4 +114,6 @@ auth_groups:
     gid: 20001
   users:
     gid: 20002
+  depad:
+    gid: 20003
 ...
\ No newline at end of file
diff --git a/group_vars/hyperchicken-cluster/vars.yml b/group_vars/hyperchicken-cluster/vars.yml
index 09794055a..07ca48ba9 100644
--- a/group_vars/hyperchicken-cluster/vars.yml
+++ b/group_vars/hyperchicken-cluster/vars.yml
@@ -57,16 +57,16 @@ local_regular_groups:
   - 'users'
   - 'depad'
 local_regular_users:
-  - 'envsync'
+  - user: 'envsync'
     groups: ['depad']
-  - 'gvdvries'
+  - user: 'gvdvries'
     groups: ['users', 'depad']
-  - 'mbijlsma'
+  - user: 'mbijlsma'
     groups: ['users', 'depad']
-  - 'mswerts'
+  - user: 'mswertz'
     groups: ['users', 'depad']
-  - 'pneerincx'
+  - user: 'pneerincx'
     groups: ['users', 'depad']
-  - 'rkanninga'
+  - user: 'rkanninga'
     groups: ['users', 'depad']
 ...
diff --git a/local_regular_users.yml b/local_regular_users.yml
index fade29d5a..c46e3cd24 100644
--- a/local_regular_users.yml
+++ b/local_regular_users.yml
@@ -11,25 +11,25 @@
       with_items: "{{ local_regular_groups }}"
     - name: "Check if required private groups for user's home dir are present."
       group:
-        name: "{{ item }}"                 # Use same name as user's account name for user's private group.
-        gid: "{{ auth_users[item].uid }}"  # Use same GID as user's UID for user's private group.
+        name: "{{ item.user }}"                 # Use same name as user's account name for user's private group.
+        gid: "{{ auth_users[item.user].uid }}"  # Use same GID as user's UID for user's private group.
         state: present
       with_items: "{{ local_regular_users }}"
     - name: 'Create local regular users and append them to relevant groups.'
       user:
-        name: "{{ item }}"
-        uid: "{{ auth_users[item].uid }}"
-        comment: "{{ auth_users[item].comment }}"
-        group: "{{ item }}"
+        name: "{{ item.user }}"
+        uid: "{{ auth_users[item.user].uid }}"
+        comment: "{{ auth_users[item.user].comment }}"
+        group: "{{ item.user }}"
         groups: "{{ item.groups }}"
-        home: "/home/{{ item }}"
+        home: "/home/{{ item.user }}"
         append: no
       with_items: "{{ local_regular_users }}"
     - name: 'Deploy authorized keys for local regular users.'
       authorized_key:
-        user: "{{ item }}"
-        key: "{{ auth_users[item].pub_keys }}"
+        user: "{{ item.user }}"
+        key: "{{ auth_users[item.user].pub_keys }}"
         state: present
         exclusive: yes
-      with_items: "{{ local_users }}"
+      with_items: "{{ local_regular_users }}"
 ...