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

galaxy.yml

@@ -9,6 +9,3 @@ authors:
 description: Studio Ansible collection containing common roles
 license:
   - MIT
-
-dependencies:
-  "devsec.hardening": ">=9.0.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,4 +1,7 @@
 ---
+- name: Install Docker
+  become: true
+  block:
     - name: Install Docker prerequisites
       ansible.builtin.apt:
         name:
@@ -7,7 +10,6 @@
           - python3-debian ## needed for the deb822 module
         state: present
         update_cache: true
-  become: true
 
     - name: Add Docker official APT repository (DEB822 format)
       ansible.builtin.deb822_repository:
@@ -18,7 +20,6 @@
         components: stable
         signed_by: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}/gpg"
         state: present
-  become: true
 
     - name: Install Docker CE packages
       ansible.builtin.apt:
@@ -30,39 +31,40 @@
           - docker-compose-plugin
         state: present
         update_cache: true
-  become: true
 
     - name: Ensure Docker service is running and enabled
       ansible.builtin.service:
         name: docker
         state: started
         enabled: true
-  become: true
 
-- name: Add deployment user to docker group
+- name: Configure deployment user for Docker
+  become: true
+  block:
+    - name: Add user to docker group
       ansible.builtin.user:
         name: deployment
         groups: docker
         append: true
-  become: true
 
-- name: Create target for docker compose files
+    - name: Create target for docker compose
       ansible.builtin.file:
         path: /opt/docker
         state: directory
         owner: deployment
         group: deployment
         mode: "0755"
-  become: true
 
+- name: Create app user for secure container execution
+  become: true
+  block:
     - name: Create appuser group
       ansible.builtin.group:
         name: appuser
         state: present
         gid: 9999
-  become: true
 
-- name: Create app user for secure container execution
+    - name: Create user
       ansible.builtin.user:
         name: appuser
         state: present
@@ -71,4 +73,3 @@
         system: true
         shell: /usr/sbin/nologin
         create_home: false
-  become: true

roles/security/tasks/main.yml

@@ -1,17 +1,32 @@
 ---
 - name: Harden SSH configuration
-  ansible.builtin.import_role:
+  become: true
-    name: devsec.hardening.ssh_hardening
+  block:
-  vars:
+    - name: Create SSH drop-in directory
-    ssh_permit_root_login: "no"
+      ansible.builtin.file:
-    ssh_password_authentication: "no"
+        path: /etc/ssh/sshd_config.d
+        state: directory
+        owner: root
+        group: root
+        mode: "0755"
 
+    - name: Harden SSH configuration with drop-in template
+      ansible.builtin.template:
+        src: sshd.conf.j2
+        dest: /etc/ssh/sshd_config.d/sshd.conf
+        owner: root
+        group: root
+        mode: "0644"
+      notify: Restart sshd
+
+- 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/security/templates/sshd.conf.j2

@@ -0,0 +1,5 @@
+## Disable root login
+PermitRootLogin no
+
+## Disable password authentication
+PasswordAuthentication no

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 sysadmin user
+- name: Configure sysadmin user
-  ansible.builtin.user:
+  ansible.builtin.import_tasks: sysadmin.yml
-    name: "{{ sysadmin_user }}"
+  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_user }}"
+  when: users_setup_deployment | bool
-    state: present
-    key: "{{ sysadmin_public_ssh_key }}"
-  become: true
 
-- name: Allow passwordless sudo for sudo group
+# opt in to feature flags / tasks with:
-  ansible.builtin.copy:
+# roles:
-    dest: /etc/sudoers.d/sudo-nopasswd
+#   - role: studio.ansible.users
-    content: "%sudo 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