feat: group tasks into logical blocks

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,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:
@@ -16,14 +18,15 @@
         group: root
         mode: "0644"
       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/tasks/main.yml

@@ -1,40 +1,42 @@
 ---
-- name: Create primary sysadmin user
+- name: Set up primary sysadmin user
+  when: deployment_public_ssh_key is defined
+  become: true
+  block:
+    - name: Create 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
+    - name: Add SSH public key
       ansible.posix.authorized_key:
         user: "{{ sysadmin_user }}"
         state: present
         key: "{{ sysadmin_public_ssh_key }}"
-  become: true
 
-- name: Allow passwordless sudo for sudo group
+    - name: Allow passwordless sudo
       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
 
-- name: Create deployment user for CI/CD
+
+- name: Set up deployment user for CI/CD
+  when: deployment_public_ssh_key is defined
+  become: true
+  block:
+    - name: Create user
       ansible.builtin.user:
         name: deployment
         shell: /bin/bash
         create_home: yes
-  become: true
-  when: deployment_public_ssh_key is defined
 
-- name: Add SSH public key for deployment user
+    - name: Add SSH public key
       ansible.posix.authorized_key:
         user: deployment
         state: present
         key: "{{ deployment_public_ssh_key }}"
-  become: true
-  when: deployment_public_ssh_key is defined