feat: set feature flags to opt in or out of tasks

users/tasks/main.yml functions as a thin dispatcher with logical steps imported from their own files gated by a variable

meta/runtime.yml

@@ -0,0 +1,2 @@
+---
+requires_ansible: ">=2.15.0"

roles/base/tasks/main.yml

@@ -35,5 +35,3 @@
 #       APT::Periodic::Unattended-Upgrade "1";
 #     mode: "0644"
 #   when: ansible_facts['os_family'] == "Debian"
-
-## SCHEDULE REBOOTS 4 kernel upgrades: with cron, unattended-upgrades or action workflows?

roles/docker/tasks/main.yml

@@ -1,42 +1,27 @@
 ---
+- name: Install Docker
+  become: true
+  block:
     - name: Install Docker prerequisites
       ansible.builtin.apt:
         name:
           - ca-certificates
           - curl
+          - python3-debian ## needed for the deb822 module
         state: present
         update_cache: true
-  become: true
 
-- name: Ensure APT keyrings directory exists
+    - name: Add Docker official APT repository (DEB822 format)
-  ansible.builtin.file:
+      ansible.builtin.deb822_repository:
-    path: /etc/apt/keyrings
+        name: docker
-    state: directory
+        types: deb
-    mode: "0755"
+        uris: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}"
-  become: true
+        suites: "{{ ansible_facts['distribution_release'] }}"
-
+        components: stable
-- name: Download Docker official GPG key
+        signed_by: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}/gpg"
-  ansible.builtin.get_url:
-    url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg"
-    dest: /etc/apt/keyrings/docker.asc
-    mode: "0644"
-  become: true
-
-- name: Get system architecture
-  ansible.builtin.command: dpkg --print-architecture
-  register: dpkg_architecture
-  changed_when: false
-  become: true
-
-- name: Add Docker official APT repository
-  ansible.builtin.apt_repository:
-    repo: "deb [arch={{ dpkg_architecture.stdout }} signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable"
         state: present
-    filename: docker
-    update_cache: yes
-  become: true
 
-- name: Install modern Docker CE packages
+    - name: Install Docker CE packages
       ansible.builtin.apt:
         name:
           - docker-ce
@@ -45,32 +30,22 @@
           - docker-buildx-plugin
           - docker-compose-plugin
         state: present
-  become: true
+        update_cache: true
 
-- name: Ensure Docker services are running and enabled
+    - name: Ensure Docker service is running and enabled
       ansible.builtin.service:
         name: docker
         state: started
         enabled: true
-  become: true
 
-- name: Create docker user for container execution
+- name: Configure deployment user for Docker
-  ansible.builtin.user:
-    name: docker
-    state: present
-    system: true
-    shell: /usr/sbin/nologin
-    groups: docker
-    append: true
-    create_home: false
   become: true
-
+  block:
-- name: Add deployment user to docker group
+    - name: Add user to docker group
       ansible.builtin.user:
         name: deployment
         groups: docker
         append: true
-  become: true
 
     - name: Create target for docker compose
       ansible.builtin.file:
@@ -79,4 +54,22 @@
         owner: deployment
         group: deployment
         mode: "0755"
+
+- name: Create app user for secure container execution
   become: true
+  block:
+    - name: Create appuser group
+      ansible.builtin.group:
+        name: appuser
+        state: present
+        gid: 9999
+
+    - name: Create user
+      ansible.builtin.user:
+        name: appuser
+        state: present
+        uid: 9999
+        group: appuser
+        system: true
+        shell: /usr/sbin/nologin
+        create_home: false

roles/security/tasks/main.yml

@@ -1,4 +1,7 @@
 ---
+- name: Harden SSH configuration
+  become: true
+  block:
     - name: Create SSH drop-in directory
       ansible.builtin.file:
         path: /etc/ssh/sshd_config.d
@@ -6,7 +9,6 @@
         owner: root
         group: root
         mode: "0755"
-  become: true
 
     - name: Harden SSH configuration with drop-in template
       ansible.builtin.template:
@@ -15,16 +17,16 @@
         owner: root
         group: root
         mode: "0644"
-    validate: "sshd -t -f %s"
       notify: Restart sshd
-  become: true
 
+- name: Enable fail2ban
+  become: true
+  block:
     - name: Install fail2ban
       ansible.builtin.apt:
         name:
           - fail2ban
         state: present
-  become: true
 
     - name: Start fail2ban
       ansible.builtin.service:

roles/users/defaults/main.yml

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

roles/users/tasks/deployment.yml

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

@@ -0,0 +1,24 @@
+---
+- 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