fix: user creation

roles/docker/tasks/main.yml

@@ -39,9 +39,10 @@
         enabled: true
 
 - name: Configure deployment user for Docker
+  when: deployment_public_ssh_key is defined
   become: true
   block:
-    - name: Add user to docker group
+    - name: Add deployment user to docker group
       ansible.builtin.user:
         name: deployment
         groups: docker
@@ -64,7 +65,7 @@
         state: present
         gid: 9999
 
-    - name: Create user
+    - name: Create appuser
       ansible.builtin.user:
         name: appuser
         state: present

roles/users/defaults/main.yml

@@ -1,3 +0,0 @@
----
-users_setup_sysadmin: true
-users_setup_deployment: false   # opt-in: enable explicitly to use

roles/users/tasks/deployment.yml

@@ -1,14 +0,0 @@
----
-- name: Create deployment user for CI/CD
-  ansible.builtin.user:
-    name: deployment
-    shell: /bin/bash
-    create_home: yes
-  become: true
-
-- name: Add SSH public key for deployment user
-  ansible.posix.authorized_key:
-    user: deployment
-    state: present
-    key: "{{ deployment_public_ssh_key }}"
-  become: true

roles/users/tasks/main.yml

@@ -1,14 +1,42 @@
 ---
-- name: Configure sysadmin user
+- name: Set up primary sysadmin user
-  ansible.builtin.import_tasks: sysadmin.yml
+  when: sysadmin_public_ssh_key is defined
-  when: users_setup_sysadmin | bool
+  become: true
+  block:
+    - name: Create sysadmin user
+      ansible.builtin.user:
+        name: "{{ sysadmin_user }}"
+        groups: sudo
+        append: yes
+        shell: /bin/bash
+        create_home: yes
 
-- name: Configure deployment user
+    - name: Add SSH public key
-  ansible.builtin.import_tasks: deployment.yml
+      ansible.posix.authorized_key:
-  when: users_setup_deployment | bool
+        user: "{{ sysadmin_user }}"
+        state: present
+        key: "{{ sysadmin_public_ssh_key }}"
 
-# opt in to feature flags / tasks with:
+    - name: Allow passwordless sudo
-# roles:
+      ansible.builtin.copy:
-#   - role: studio.ansible.users
+        dest: /etc/sudoers.d/sudo-nopasswd
-#     vars:
+        content: "%sudo ALL=(ALL) NOPASSWD: ALL"
-#       users_setup_deployment: true
+        mode: "0440"
+        validate: /usr/sbin/visudo -cf %s
+
+
+- name: Set up deployment user for CI/CD
+  when: deployment_public_ssh_key is defined
+  become: true
+  block:
+    - name: Create deployment user
+      ansible.builtin.user:
+        name: deployment
+        shell: /bin/bash
+        create_home: yes
+
+    - name: Add SSH public key
+      ansible.posix.authorized_key:
+        user: deployment
+        state: present
+        key: "{{ deployment_public_ssh_key }}"

roles/users/tasks/sysadmin.yml

@@ -1,24 +0,0 @@
----
-- name: Create primary sysadmin user
-  ansible.builtin.user:
-    name: "{{ sysadmin_user }}"
-    groups: sudo
-    append: yes
-    shell: /bin/bash
-    create_home: yes
-  become: true
-
-- name: Add SSH public key for sysadmin
-  ansible.posix.authorized_key:
-    user: "{{ sysadmin_user }}"
-    state: present
-    key: "{{ sysadmin_public_ssh_key }}"
-  become: true
-
-- name: Allow passwordless sudo for sudo group
-  ansible.builtin.copy:
-    dest: /etc/sudoers.d/sudo-nopasswd
-    content: "%sudo ALL=(ALL) NOPASSWD: ALL"
-    mode: "0440"
-    validate: /usr/sbin/visudo -cf %s
-  become: true