From cc3dc6ea508af4aa308189e6bda27e116bc5bb2b Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Wed, 8 Oct 2025 10:25:59 -0400
Subject: [PATCH] ...

---
 app-configs/rinoa/apprise/conf/apprise.yml.j2 |  1 -
 tar-valon_config_deploy.yml                   | 35 +++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app-configs/rinoa/apprise/conf/apprise.yml.j2 b/app-configs/rinoa/apprise/conf/apprise.yml.j2
index 948c0f0..ac83b1a 100644
--- a/app-configs/rinoa/apprise/conf/apprise.yml.j2
+++ b/app-configs/rinoa/apprise/conf/apprise.yml.j2
@@ -1,6 +1,5 @@
 {% set vault_addr = 'https://vault.trez.wtf' %}
 {% set secrets_path = 'rinoa-docker/env' %}
-
 urls:
   - gotify://gotify/{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token)['secret']['APPRISE_GOTIFY_TOKEN'] }}
   - hassio://192.168.1.252/{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token)['secret']['APPRISE_HA_TOKEN'] }}
diff --git a/tar-valon_config_deploy.yml b/tar-valon_config_deploy.yml
index 629fe35..d3291da 100644
--- a/tar-valon_config_deploy.yml
+++ b/tar-valon_config_deploy.yml
@@ -29,24 +29,29 @@
         remote_uid: "{{ remote_user_info.stdout_lines[0] | default(default_owner) | int }}"
         remote_gid: "{{ remote_user_info.stdout_lines[1] | default(default_group) | int }}"
 
+    - name: Initialize file metadata with become info
+      ansible.builtin.set_fact:
+        file_metadata_with_become: {}
+
     - name: Annotate file metadata with become requirement
       ansible.builtin.set_fact:
         file_metadata_with_become: >-
           {{
-            (file_metadata | default({})) | dict2items
-            | map('combine', {
-                'value': item.value | combine({
-                  'owner': (item.value.owner | default(default_owner) | string),
-                  'group': (item.value.group | default(default_group) | string),
-                  'mode':  (item.value.mode  | default(default_mode)  | string),
-                  'become': (
-                    ((item.value.owner | default(default_owner) | int) != remote_uid) or
-                    ((item.value.group | default(default_group) | int) != remote_gid)
-                  )
-                })
+            file_metadata_with_become | combine({
+              item.key: item.value | combine({
+                'owner': (item.value.owner | default(default_owner) | string),
+                'group': (item.value.group | default(default_group) | string),
+                'mode':  (item.value.mode  | default(default_mode)  | string),
+                'become': (
+                  ((item.value.owner | default(default_owner) | int) != remote_uid) or
+                  ((item.value.group | default(default_group) | int) != remote_gid)
+                )
               })
-            | items2dict
+            })
           }}
+      loop: "{{ file_metadata | dict2items }}"
+      loop_control:
+        label: "{{ item.key }}"
 
     - name: Find all files for this host (control node)
       ansible.builtin.find:
@@ -76,7 +81,7 @@
         deploy_files: >-
           {{
             host_files.files
-            | map('extract', attribute='path')
+            | map(attribute='path')
             | map('community.general.dict_kv', item => {
                 'src': item,
                 'dest': appdata_base_path ~ '/' ~ (item | relpath(template_base_path ~ '/' ~ inventory_hostname) | regex_replace('\.j2$', '')),
@@ -104,10 +109,10 @@
           {% endfor %}
       run_once: true
 
-    - name: Print concise become true list
+    - name: Print concise become list
       ansible.builtin.debug:
         msg: >-
-          Files requiring become=true:
+          Files requiring become:
           {% set found = false %}
           {% for f in deploy_files if f.become %}
           {% set found = true %}