Remove default dirname plugin & use wireguard directory for provisioning

tasks/wireguard.yml

@@ -16,14 +16,16 @@
 - name: Create Wireguard directories
   become: true
   ansible.builtin.file:
-    path: '{{ item | dirname }}'
+    path: '{{ item }}'
     owner: root
     group: systemd-network
     mode: '0640'
     state: directory
     recurse: true
   loop:
-    - '{{ vpn_key_directory }}'
+    - '{{ vpn_config_dir }}'
+    - '{{ vpn_media_server_public_key_path | dirname }}'
+    - '{{ vpn_media_server_key_path | dirname }}'
 
 - name: Copy Wireguard server credentials
   become: true
@@ -50,9 +52,9 @@
     mode: '0640'
   loop:
     - src: 'files/wireguard/default/mobile.pub'
-      dest: '{{ vpn_key_directory }}/public/mobile.pub'
+      dest: '{{ vpn_config_dir }}/keys/public/mobile.pub'
     - src: 'files/wireguard/default/mobile.key'
-      dest: '{{ vpn_key_directory }}/private/mobile.key'
+      dest: '{{ vpn_config_dir }}/keys/private/mobile.key'
   notify: restart systemd-networkd
 
 - name: Copy Wireguard preshared keys

tasks/wireguard_media.yml

@@ -23,7 +23,9 @@
     state: directory
     recurse: true
   loop:
-    - '{{ vpn_media_key_directory }}'
+    - '{{ vpn_config_dir }}'
+    - '{{ vpn_server_public_key_path | dirname }}'
+    - '{{ vpn_server_private_key_path | dirname }}'
 
 - name: Copy Wireguard server media credentials
   become: true
@@ -49,17 +51,17 @@
     mode: '0640'
   loop:
     - src: 'files/wireguard/media/mobile-1.pub'
-      dest: '{{ vpn_media_key_directory }}/public/mobile_1.pub'
+      dest: '{{ vpn_config_dir }}/keys/public/mobile_1.pub'
     - src: 'files/wireguard/media/mobile-1.key'
-      dest: '{{ vpn_media_key_directory }}/private/mobile_1.key'
+      dest: '{{ vpn_config_dir }}/keys/private/mobile_1.key'
     - src: 'files/wireguard/media/mobile-2.pub'
-      dest: '{{ vpn_media_key_directory }}/public/mobile_2.pub'
+      dest: '{{ vpn_config_dir }}/keys/public/mobile_2.pub'
     - src: 'files/wireguard/media/mobile-2.key'
-      dest: '{{ vpn_media_key_directory }}/private/mobile_2.key'
+      dest: '{{ vpn_config_dir }}/keys/private/mobile_2.key'
     - src: 'files/wireguard/media/tv.pub'
-      dest: '{{ vpn_media_key_directory }}/public/tv.pub'
+      dest: '{{ vpn_config_dir }}/keys/public/tv.pub'
     - src: 'files/wireguard/media/tv.key'
-      dest: '{{ vpn_media_key_directory }}/private/tv.key'
+      dest: '{{ vpn_config_dir }}/keys/private/tv.key'
 
 - name: Copy wireguard media preshared keys
   become: true