feat: use ansible block

tasks/apt/cleanup.yaml

@@ -1,18 +1,22 @@
 ---
 
-# clean apt cache
-- name: "apt - clean cache"
-  ansible.builtin.apt:
-    clean: true
-  changed_when: false
-  failed_when: false
-  tags: "apt-cleanup"
-  when: 'ansible_os_family == "Debian"'
+# apt cleanup
+- name: "apt cleanup"
+  block:
+
+    # clean apt cache
+    - name: "apt - clean cache"
+      ansible.builtin.apt:
+        clean: true
+      changed_when: false
+      failed_when: false
+      when: 'ansible_os_family == "Debian"'
+
+    # run fstrim if target is a VM
+    - name: "fstrim"
+      ansible.builtin.command: "fstrim /"
+      changed_when: false
+      failed_when: false
+      when: 'type == "vm"'
 
-# run fstrim if target is a VM
-- name: "fstrim"
-  ansible.builtin.command: "fstrim /"
-  changed_when: false
-  failed_when: false
   tags: "apt-cleanup"
-  when: 'type == "vm"'

tasks/apt/config.yaml

@@ -1,24 +1,27 @@
 ---
 
-# configure apt auto update
-- name: "apt - config - configure apt periodic"
-  ansible.builtin.template:
-    src: "templates/apt/conf.d/10periodic.j2"
-    dest: "/etc/apt/apt.conf.d/10periodic"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  when: 'ansible_os_family == "Debian"'
-  tags:
-    - "apt"
+# apt config
+- name: "apt config"
+  block:
+
+    # configure apt auto update
+    - name: "apt - config - configure apt periodic"
+      ansible.builtin.template:
+        src: "templates/apt/conf.d/10periodic.j2"
+        dest: "/etc/apt/apt.conf.d/10periodic"
+        owner: "root"
+        group: "root"
+        mode: "0644"
+      when: 'ansible_os_family == "Debian"'
+
+    - name: "apt - config - configure apt unatteded updates"
+      ansible.builtin.template:
+        src: "templates/apt/conf.d/50unattended-upgrades.{{ ansible_distribution }}.j2"
+        dest: "/etc/apt/apt.conf.d/50unattended-upgrades"
+        owner: "root"
+        group: "root"
+        mode: "0644"
+      when: 'ansible_os_family == "Debian"'
 
-- name: "apt - config - configure apt unatteded updates"
-  ansible.builtin.template:
-    src: "templates/apt/conf.d/50unattended-upgrades.{{ ansible_distribution }}.j2"
-    dest: "/etc/apt/apt.conf.d/50unattended-upgrades"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  when: 'ansible_os_family == "Debian"'
   tags:
     - "apt"

tasks/apt/packages.yaml

@@ -1,27 +1,30 @@
 ---
 
-# install packages
-- name: "apt - install - packages"
-  ansible.builtin.apt:
-    name: "{{ apt_default_install }}"
-    state: "present"
-    update_cache: true
-  when: 'ansible_os_family == "Debian"'
-  loop: "{{ apt_default_packages_install }}"
-  loop_control:
-    loop_var: "apt_default_install"
-  tags:
-    - "apt"
+# apt packages
+- name: "apt packages"
+  block:
+
+    # install packages
+    - name: "apt - install - packages"
+      ansible.builtin.apt:
+        name: "{{ apt_default_install }}"
+        state: "present"
+        update_cache: true
+      when: 'ansible_os_family == "Debian"'
+      loop: "{{ apt_default_packages_install }}"
+      loop_control:
+        loop_var: "apt_default_install"
+
+    # purge packages
+    - name: "apt - delete - packages"
+      ansible.builtin.apt:
+        name: "{{ apt_default_delete }}"
+        state: "absent"
+        purge: true
+      when: 'ansible_os_family == "Debian"'
+      loop: "{{ apt_default_packages_delete }}"
+      loop_control:
+        loop_var: "apt_default_delete"
 
-# purge packages
-- name: "apt - delete - packages"
-  ansible.builtin.apt:
-    name: "{{ apt_default_delete }}"
-    state: "absent"
-    purge: true
-  when: 'ansible_os_family == "Debian"'
-  loop: "{{ apt_default_packages_delete }}"
-  loop_control:
-    loop_var: "apt_default_delete"
   tags:
-    - "apt"
+  - "apt"

tasks/apt/sources.yaml

@@ -1,42 +1,43 @@
 ---
 
-# configure apt sources
-- name: "apt - config - configure apt sources"
-  ansible.builtin.template:
-    src: "templates/apt/sources.d/sources.list.{{ ansible_distribution }}.j2"
-    dest: "/etc/apt/sources.list"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  when:
-    - 'ansible_os_family == "Debian"'
-    - 'ansible_distribution_major_version <= "23"'
-  notify: "apt force cache update"
-  tags:
-    - "apt"
+# manage apt sources
+- name: "manage apt sources"
+  block:
 
-# configure apt sources
-- name: "apt - config - configure apt sources"
-  ansible.builtin.template:
-    src: "templates/apt/sources.d/{{ ansible_distribution }}.sources.j2"
-    dest: "/etc/apt/sources.list.d/ubuntu.sources"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  when:
-    - 'ansible_distribution == "Ubuntu"'
-    - 'ansible_distribution_major_version >= "24"'
-  notify: "apt force cache update"
-  tags:
-    - "apt"
+    # configure apt sources
+    - name: "apt - config - configure apt sources"
+      ansible.builtin.template:
+        src: "templates/apt/sources.d/sources.list.{{ ansible_distribution }}.j2"
+        dest: "/etc/apt/sources.list"
+        owner: "root"
+        group: "root"
+        mode: "0644"
+      when:
+        - 'ansible_os_family == "Debian"'
+        - 'ansible_distribution_major_version <= "23"'
+      notify: "apt force cache update"
+
+    # configure apt sources
+    - name: "apt - config - configure apt sources"
+      ansible.builtin.template:
+        src: "templates/apt/sources.d/{{ ansible_distribution }}.sources.j2"
+        dest: "/etc/apt/sources.list.d/ubuntu.sources"
+        owner: "root"
+        group: "root"
+        mode: "0644"
+      when:
+        - 'ansible_distribution == "Ubuntu"'
+        - 'ansible_distribution_major_version >= "24"'
+      notify: "apt force cache update"
+
+    # delete unused sources.list
+    - name: "apt - config - remove old sources.list"
+      ansible.builtin.file:
+        path: "/etc/apt/sources.list"
+        state: "absent"
+      when:
+        - 'ansible_distribution == "Ubuntu"'
+        - 'ansible_distribution_major_version >= "24"'
 
-# delete unused sources.list
-- name: "apt - config - remove old sources.list"
-  ansible.builtin.file:
-    path: "/etc/apt/sources.list"
-    state: "absent"
-  when:
-    - 'ansible_distribution == "Ubuntu"'
-    - 'ansible_distribution_major_version >= "24"'
   tags:
     - "apt"