From fcd4ebd302953c93b961871716cd2ab745996e0b Mon Sep 17 00:00:00 2001
From: Christoph Sieber <bsod@zom.bi>
Date: Thu, 23 Mar 2023 01:08:47 +0100
Subject: [PATCH] set defaults for shell and comment

---
 ansible/group_vars/all/users.yml     | 5 -----
 ansible/roles/common/tasks/users.yml | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ansible/group_vars/all/users.yml b/ansible/group_vars/all/users.yml
index d99adc7..c770392 100644
--- a/ansible/group_vars/all/users.yml
+++ b/ansible/group_vars/all/users.yml
@@ -2,21 +2,16 @@
 users:
   - name: bsod
     uid: 1001
-    comment: bsod user
-    shell: /bin/bash
     keys:
       - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1IX4cXX3VS6qpALQX+3COD1wPArr8CAMfyGZUYx3t3ZVhxyxvdNJFLZe5mIXEUlRI8Q7MzH9Cr2T9g0O7tJIpwTSiL0ZoUhpPf/fGcUxD+MP7L5Gd5qwxfzlafZGWb7pdcY3AsIfCdZKMGKS6B+D3acweENSKMFiKZ5QBnShjx0Tw6sFmVq6Yaxw82lSmRAu73UskL0wOBA81VkJj7+WOuQWw7aCiIEQGysquo5phMBlnMpl6s7yVL0TGJqMSya//mcwc3T7H7AHshaYYbbsWMURXcaLktXeQw3qTeWDH2JS/UBDfIth1artGQeMYG+ARlrDJVsgbVzZG7A+kMwkz bsod@glados"
 
   - name: lino
     uid: 1002
-    comment: Linus Erbil
-    shell: /bin/bash
     keys:
       - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL5vHIAhSnWT3se5lC+DesiTYqELzU7E9JKTh7gNIWS+"
 
   - name: lod
     uid: 1003
-    comment: lod
     keys:
       - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHHP8fvK2xoz/WnrZdPT6Qe6l1uILxIiUPHhU+4TrHwgqcba1UmURrF0aZBbXxmZKpQrWQxu6zye27Wk3CYgUQNmyC+qvWT5XtKdy4nlnVj51N7ihEZ5CHtcMBA8vldpE87YCaIgREq0DY05mEHn+5U5GiSvUKkgPLeV3wqEdYVgoDR9/eQ8rwBsQN2wfWJDJx63Ay+wBOxdvmQ4oWquQBpE6gX/dvhtuBG9OCM8hvevvsBg2N9TuMf70mkk/ElLx2rMUPUk3EgKlUhnnHNVSx0HnKiyqs81FdNCOU4tpSht15+9GnI4+ETMjwG617SsyESa1770U5k7VHPwyo0wB1zdQ58DDaA9sWizcREv5ru6Fr7dW8PGFIdx+i8ZsRkIXCP8be1n3KfCySvrLNmGvCoC9avjw3TbGTItXeSFrEdRh/pLkJtfvViU3UnwnT+HuQwCd6BrVKyd1Ee9MSrKKw9rYWph1UUqJK+Q3L/IWIa7pOkO6pMDizCnj8HjyU1YzvEQAkrlCSEQsU78EP4hg/f1BTPH1t/3Uy8q36/0V4dQIa5d1G+DDSgrRukM1G67V0IPq7uKEf6WBaoMb6XTXt8/RB2bLaD0XuRlcA5wkgRAmL8S0dBR9dSzwLMQMM91eCiejxX1akyvDSaSsZ6t2MpHQeG0sTn8Jld8NjSsEkbw=="
 
diff --git a/ansible/roles/common/tasks/users.yml b/ansible/roles/common/tasks/users.yml
index 67dbb52..1e11e2f 100644
--- a/ansible/roles/common/tasks/users.yml
+++ b/ansible/roles/common/tasks/users.yml
@@ -2,9 +2,9 @@
 - name: Add users
   user:
     name: "{{ item.name }}"
-    comment: "{{ item.comment }}"
+    comment: "{{ item.comment | default('user setup via ansible') }}"
     uid: "{{ item.uid }}"
-    shell: "{{ item.shell }}"
+    shell: "{{ item.shell | default('/bin/bash') }}"
     groups: "sudo"
     state: present
   loop: "{{ users }}"