From b0b32e4a629bcba06b1c626d9c76d1edfc05bada Mon Sep 17 00:00:00 2001
From: Annika Merris <annika@adhdgirl.dev>
Date: Sat, 3 May 2025 00:49:04 +0000
Subject: [PATCH] User creation cleanup.

---
 .../adhdgirl/minilab/roles/common/tasks/users.yaml     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/common/tasks/users.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/common/tasks/users.yaml
index 4f558f1..e28b5ba 100644
--- a/collections/ansible_collections/adhdgirl/minilab/roles/common/tasks/users.yaml
+++ b/collections/ansible_collections/adhdgirl/minilab/roles/common/tasks/users.yaml
@@ -3,6 +3,11 @@
   tags: groups,users
   ansible.builtin.include_vars:
     file: "users/{{ user_name }}.yaml"
+- name: Check if user exists
+  ansible.builtin.user:
+    name: "{{ user_name }}"
+  check_mode: true
+  register: user_exists
 - name: Ensure group exists
   tags: groups,users
   ansible.builtin.group:
@@ -15,7 +20,12 @@
     group: "{{ user_name }}"
     groups: "adm,{{ common_sudo_group }}"
     state: present
+- name: Set user password, if appropriate
+  tags: users
+  ansible.builtin.user:
+    name: "{{ user_name }}"
     password: "{{ common_user_password | string | password_hash('sha512') }}"
+  when: user_exists.state != 'present'
 - name: Adjust shell for Debian hosts
   tags: settings,users,debian
   ansible.builtin.user: