Fix network task linter errors

tasks/network.yml

@@ -3,9 +3,9 @@
 # using `wg set wg0 peer izHzmRwh2yzICps6pFI2Bg3TnmTD66/8uH4loJpkuD4= endpoint <NEW-IP>:<PORT>`
 # for example.
 
-- name: create wireguard directories
+- name: Create wireguard directories
   become: true
-  file:
+  ansible.builtin.file:
     path: '{{ item | dirname }}'
     owner: root
     group: systemd-network
@@ -17,35 +17,30 @@
     - '{{ vpn_media.private_key_path }}'
     - '{{ vpn_media.public_key_path }}'
 
-- name: copy wireguard credentials
+- name: Copy wireguard credentials
   become: true
-  copy:
+  ansible.builtin.copy:
     src: '{{ item.src }}'
     dest: '{{ item.dest }}'
     owner: root
     group: systemd-network
     mode: '0640'
   loop:
-    - {
+    - dest: '{{ vpn_default.public_key_path }}'
-        dest: '{{ vpn_default.public_key_path }}',
+      src: 'files/{{ platform }}/wireguard/default/{{ platform }}.pub'
-        src: 'files/{{ platform }}/wireguard/default/{{ platform }}.pub',
-      }
-    - {
-        dest: '{{ vpn_default.private_key_path }}',
-        src: 'files/{{ platform }}/wireguard/default/{{ platform }}.key',
-      }
-    - {
-        dest: '{{ vpn_media.public_key_path }}',
-        src: 'files/{{ platform }}/wireguard/media/{{ platform }}.pub',
-      }
-    - {
-        dest: '{{ vpn_media.private_key_path }}',
-        src: 'files/{{ platform }}/wireguard/media/{{ platform }}.key',
-      }
 
-- name: copy wireguard preshared keys
+    - dest: '{{ vpn_default.private_key_path }}'
+      src: 'files/{{ platform }}/wireguard/default/{{ platform }}.key'
+
+    - dest: '{{ vpn_media.public_key_path }}'
+      src: 'files/{{ platform }}/wireguard/media/{{ platform }}.pub'
+
+    - dest: '{{ vpn_media.private_key_path }}'
+      src: 'files/{{ platform }}/wireguard/media/{{ platform }}.key'
+
+- name: Copy wireguard preshared keys
   become: true
-  copy:
+  ansible.builtin.copy:
     src: '{{ item.preshared_key_source_path }}'
     dest: '{{ item.preshared_key_path }}'
     owner: root
@@ -53,100 +48,88 @@
     mode: '0640'
   loop: '{{ vpn_default.peers + vpn_media.peers }}'
 
-- block:
+- name: Desktop configuration
-    - name: setup desktop network configuration
-      become: true
-      template:
-        src: '{{ item.src }}'
-        dest: '{{ item.dest }}'
-        owner: root
-        group: systemd-network
-        mode: '0640'
-      loop:
-        - {
-            src: 'templates/desktop/network/enp.network.j2',
-            dest: '/etc/systemd/network/20-wired.network',
-          }
-        - {
-            src: 'templates/desktop/network/wg0.network.j2',
-            dest: '/etc/systemd/network/40-wg0.network',
-          }
-        - {
-            src: 'templates/desktop/network/wg0.netdev.j2',
-            dest: '/etc/systemd/network/40-wg0.netdev',
-          }
-        - {
-            src: 'templates/desktop/network/wg1.network.j2',
-            dest: '/etc/systemd/network/40-wg1.network',
-          }
-        - {
-            src: 'templates/desktop/network/wg1.netdev.j2',
-            dest: '/etc/systemd/network/40-wg1.netdev',
-          }
-
-    - name: remove leftover configuration files
-      become: true
-      file:
-        path: '{{ item }}'
-        state: absent
-      loop:
-        - '/etc/systemd/network/30-vmbr0.network'
-        - '/etc/systemd/network/30-vmbr0.netdev'
-
   notify:
     - restart systemd-networkd
     - restart systemd-resolved
   when: platform == "desktop"
-
+  block:
-- block:
+    - name: Setup network configuration
-    - name: setup laptop network configuration
       become: true
-      template:
+      ansible.builtin.template:
         src: '{{ item.src }}'
         dest: '{{ item.dest }}'
         owner: root
         group: systemd-network
         mode: '0640'
       loop:
-        - {
+        - src: 'templates/desktop/network/enp.network.j2'
-            src: 'templates/laptop/network/wireless.network.j2',
+          dest: '/etc/systemd/network/20-wired.network'
-            dest: '/etc/systemd/network/20-wireless.network',
-          }
-        - {
-            src: 'templates/laptop/network/wg0.network.j2',
-            dest: '/etc/systemd/network/40-wg0.network',
-          }
-        - {
-            src: 'templates/laptop/network/wg0.netdev.j2',
-            dest: '/etc/systemd/network/40-wg0.netdev',
-          }
-        - {
-            src: 'templates/laptop/network/wg1.network.j2',
-            dest: '/etc/systemd/network/40-wg1.network',
-          }
-        - {
-            src: 'templates/laptop/network/wg1.netdev.j2',
-            dest: '/etc/systemd/network/40-wg1.netdev',
-          }
 
-    - name: remove leftover configuration files
+        - src: 'templates/desktop/network/wg0.network.j2'
+          dest: '/etc/systemd/network/40-wg0.network'
+
+        - src: 'templates/desktop/network/wg0.netdev.j2'
+          dest: '/etc/systemd/network/40-wg0.netdev'
+
+        - src: 'templates/desktop/network/wg1.network.j2'
+          dest: '/etc/systemd/network/40-wg1.network'
+
+        - src: 'templates/desktop/network/wg1.netdev.j2'
+          dest: '/etc/systemd/network/40-wg1.netdev'
+
+    - name: Remove leftover configuration files
       become: true
-      file:
+      ansible.builtin.file:
         path: '{{ item }}'
         state: absent
       loop:
         - '/etc/systemd/network/30-vmbr0.network'
         - '/etc/systemd/network/30-vmbr0.netdev'
 
+- name: Laptop configuration
   notify:
     - restart systemd-networkd
     - restart systemd-resolved
     - restart iwd
   when: platform == "laptop"
+  block:
+    - name: Setup network configuration
+      become: true
+      ansible.builtin.template:
+        src: '{{ item.src }}'
+        dest: '{{ item.dest }}'
+        owner: root
+        group: systemd-network
+        mode: '0640'
+      loop:
+        - src: 'templates/laptop/network/wireless.network.j2'
+          dest: '/etc/systemd/network/20-wireless.network'
 
-- name: copy firewall template
+        - src: 'templates/laptop/network/wg0.network.j2'
+          dest: '/etc/systemd/network/40-wg0.network'
+
+        - src: 'templates/laptop/network/wg0.netdev.j2'
+          dest: '/etc/systemd/network/40-wg0.netdev'
+
+        - src: 'templates/laptop/network/wg1.network.j2'
+          dest: '/etc/systemd/network/40-wg1.network'
+
+        - src: 'templates/laptop/network/wg1.netdev.j2'
+          dest: '/etc/systemd/network/40-wg1.netdev'
+
+    - name: Remove leftover configuration files
+      become: true
+      ansible.builtin.file:
+        path: '{{ item }}'
+        state: absent
+      loop:
+        - '/etc/systemd/network/30-vmbr0.network'
+        - '/etc/systemd/network/30-vmbr0.netdev'
+
+- name: Copy firewall template
   become: true
-  template:
+  ansible.builtin.template:
     src: 'templates/{{ platform }}/nftables.j2'
     dest: '/etc/nftables.conf'
     owner: root