From f3c8f0d6451a2f0653cfab45162bedbd45c73786 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Mon, 13 Jul 2026 11:48:23 -0400
Subject: [PATCH] Jinja template fix.

---
 app-configs/aranea/dagu/dags/mariadb-backups.yaml.j2          | 4 ++--
 app-configs/rikku/adguard/conf/AdGuardHome.yaml.j2            | 4 ++--
 app-configs/rinoa/adguardhome/conf/AdGuardHome.yaml.j2        | 4 ++--
 app-configs/rinoa/apprise/conf/apprise.yml.j2                 | 4 ++--
 app-configs/rinoa/authelia/configuration.yml.j2               | 4 ++--
 app-configs/rinoa/crowdsec/acquis.yaml.j2                     | 4 ++--
 app-configs/rinoa/crowdsec/config.yaml.j2                     | 4 ++--
 app-configs/rinoa/crowdsec/local-api-credentials.yaml.j2      | 4 ++--
 app-configs/rinoa/crowdsec/online-api-credentials.yaml.j2     | 4 ++--
 app-configs/rinoa/crowdsec/profiles.yaml.j2                   | 4 ++--
 app-configs/rinoa/explo/local.env.j2                          | 4 ++--
 app-configs/rinoa/ghost/ghost_config.production.json.j2       | 4 ++--
 app-configs/rinoa/gitea/conf/app.ini.j2                       | 4 ++--
 app-configs/rinoa/gitea/gitea-sonarqube-bot/config.yaml.j2    | 4 ++--
 app-configs/rinoa/homepage/bookmarks.yaml.j2                  | 4 ++--
 app-configs/rinoa/homepage/docker.yaml.j2                     | 4 ++--
 app-configs/rinoa/homepage/kubernetes.yaml.j2                 | 4 ++--
 app-configs/rinoa/homepage/services.yaml.j2                   | 4 ++--
 app-configs/rinoa/homepage/settings.yaml.j2                   | 4 ++--
 app-configs/rinoa/homepage/widgets.yaml.j2                    | 4 ++--
 app-configs/rinoa/invidious/config.yml.j2                     | 4 ++--
 app-configs/rinoa/invoice-ninja/invoice-ninja.env.j2          | 4 ++--
 app-configs/rinoa/lidarr/config.xml.j2                        | 4 ++--
 app-configs/rinoa/lidify/config.json.j2                       | 4 ++--
 app-configs/rinoa/loggifly/config.yaml.j2                     | 4 ++--
 app-configs/rinoa/mgob/config/default_mbd_bkup.yaml.j2        | 4 ++--
 app-configs/rinoa/postal/postal.yml.j2                        | 4 ++--
 app-configs/rinoa/prowlarr/config.xml.j2                      | 4 ++--
 app-configs/rinoa/qbittorrent/qbit_manage/config.yml.j2       | 4 ++--
 app-configs/rinoa/radarec/config.json.j2                      | 4 ++--
 app-configs/rinoa/radarr/config.xml.j2                        | 4 ++--
 app-configs/rinoa/sabnzbdvpn/sabnzbd.ini.j2                   | 4 ++--
 app-configs/rinoa/scrutiny/config/config.yaml.j2              | 4 ++--
 app-configs/rinoa/searxng/settings.yml.j2                     | 4 ++--
 app-configs/rinoa/searxng/uwsgi.ini.j2                        | 4 ++--
 app-configs/rinoa/signoz/common/clickhouse/cluster.ha.xml.j2  | 4 ++--
 app-configs/rinoa/signoz/common/clickhouse/cluster.xml.j2     | 4 ++--
 app-configs/rinoa/signoz/common/clickhouse/config.xml.j2      | 4 ++--
 .../rinoa/signoz/common/clickhouse/custom-function.xml.j2     | 4 ++--
 app-configs/rinoa/signoz/common/clickhouse/storage.xml.j2     | 4 ++--
 app-configs/rinoa/signoz/common/clickhouse/users.xml.j2       | 4 ++--
 app-configs/rinoa/sonarr/config.xml.j2                        | 4 ++--
 app-configs/rinoa/sonashow/config.json.j2                     | 4 ++--
 app-configs/rinoa/soularr/config.ini.j2                       | 4 ++--
 app-configs/rinoa/soulseek/slskd.yml.j2                       | 4 ++--
 app-configs/rinoa/unmanic/settings.json.j2                    | 4 ++--
 app-configs/rinoa/youtubedl/config.yml.j2                     | 4 ++--
 47 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/app-configs/aranea/dagu/dags/mariadb-backups.yaml.j2 b/app-configs/aranea/dagu/dags/mariadb-backups.yaml.j2
index be93495..0aa9325 100644
--- a/app-configs/aranea/dagu/dags/mariadb-backups.yaml.j2
+++ b/app-configs/aranea/dagu/dags/mariadb-backups.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 name: mariadb-backup
 description: "Backup of all databases from MariaDB container"
 schedule: "30 23 * * *"
diff --git a/app-configs/rikku/adguard/conf/AdGuardHome.yaml.j2 b/app-configs/rikku/adguard/conf/AdGuardHome.yaml.j2
index 74fb6bd..5b768a4 100644
--- a/app-configs/rikku/adguard/conf/AdGuardHome.yaml.j2
+++ b/app-configs/rikku/adguard/conf/AdGuardHome.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rikku-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 http:
   pprof:
diff --git a/app-configs/rinoa/adguardhome/conf/AdGuardHome.yaml.j2 b/app-configs/rinoa/adguardhome/conf/AdGuardHome.yaml.j2
index 672b969..0e2e70e 100644
--- a/app-configs/rinoa/adguardhome/conf/AdGuardHome.yaml.j2
+++ b/app-configs/rinoa/adguardhome/conf/AdGuardHome.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 http:
   pprof:
diff --git a/app-configs/rinoa/apprise/conf/apprise.yml.j2 b/app-configs/rinoa/apprise/conf/apprise.yml.j2
index 366688b..cf49c8b 100644
--- a/app-configs/rinoa/apprise/conf/apprise.yml.j2
+++ b/app-configs/rinoa/apprise/conf/apprise.yml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 urls:
   - gotify://gotify/{{ vault.kv2_field('env','APPRISE_GOTIFY_TOKEN', vault_engine_mount_point) }}
   - hassio://192.168.1.252/{{ vault.kv2_field('env','APPRISE_HA_TOKEN', vault_engine_mount_point) }}
diff --git a/app-configs/rinoa/authelia/configuration.yml.j2 b/app-configs/rinoa/authelia/configuration.yml.j2
index 0c33363..649128f 100644
--- a/app-configs/rinoa/authelia/configuration.yml.j2
+++ b/app-configs/rinoa/authelia/configuration.yml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 # yaml-language-server: $schema=https://www.authelia.com/schemas/latest/json-schema/configuration.json
 ---
diff --git a/app-configs/rinoa/crowdsec/acquis.yaml.j2 b/app-configs/rinoa/crowdsec/acquis.yaml.j2
index a2b7fc1..b69b1ca 100644
--- a/app-configs/rinoa/crowdsec/acquis.yaml.j2
+++ b/app-configs/rinoa/crowdsec/acquis.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 source: journalctl
 journalctl_filter:
   - "--directory=/var/log/host/"
diff --git a/app-configs/rinoa/crowdsec/config.yaml.j2 b/app-configs/rinoa/crowdsec/config.yaml.j2
index 46a4e81..cc032b4 100644
--- a/app-configs/rinoa/crowdsec/config.yaml.j2
+++ b/app-configs/rinoa/crowdsec/config.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 common:
   daemonize: false
   log_media: stdout
diff --git a/app-configs/rinoa/crowdsec/local-api-credentials.yaml.j2 b/app-configs/rinoa/crowdsec/local-api-credentials.yaml.j2
index 82e4143..17ef93d 100644
--- a/app-configs/rinoa/crowdsec/local-api-credentials.yaml.j2
+++ b/app-configs/rinoa/crowdsec/local-api-credentials.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 url: http://0.0.0.0:8080
 login: localhost
diff --git a/app-configs/rinoa/crowdsec/online-api-credentials.yaml.j2 b/app-configs/rinoa/crowdsec/online-api-credentials.yaml.j2
index 1ae7cb2..eac3aeb 100644
--- a/app-configs/rinoa/crowdsec/online-api-credentials.yaml.j2
+++ b/app-configs/rinoa/crowdsec/online-api-credentials.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 url: https://api.crowdsec.net/
 login: {{ vault.kv2_field('env','CROWDSEC_ONLINE_PASSWORD', vault_engine_mount_point) }}
diff --git a/app-configs/rinoa/crowdsec/profiles.yaml.j2 b/app-configs/rinoa/crowdsec/profiles.yaml.j2
index 0dfb52c..2cf69fd 100644
--- a/app-configs/rinoa/crowdsec/profiles.yaml.j2
+++ b/app-configs/rinoa/crowdsec/profiles.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 name: default_ip_remediation
 #debug: true
diff --git a/app-configs/rinoa/explo/local.env.j2 b/app-configs/rinoa/explo/local.env.j2
index ccb4547..aeb8081 100644
--- a/app-configs/rinoa/explo/local.env.j2
+++ b/app-configs/rinoa/explo/local.env.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 EXPLO_SYSTEM: subsonic
 SYSTEM_URL: http://navidrome:4533
 SYSTEM_USERNAME: {{ vault.kv2_field('env','NAVIDROME_USERNAME', vault_engine_mount_point) }}
diff --git a/app-configs/rinoa/ghost/ghost_config.production.json.j2 b/app-configs/rinoa/ghost/ghost_config.production.json.j2
index 535906e..63734fc 100644
--- a/app-configs/rinoa/ghost/ghost_config.production.json.j2
+++ b/app-configs/rinoa/ghost/ghost_config.production.json.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 {
   "url": "blog.trez.wtf",
diff --git a/app-configs/rinoa/gitea/conf/app.ini.j2 b/app-configs/rinoa/gitea/conf/app.ini.j2
index 38fb85f..f4418b7 100644
--- a/app-configs/rinoa/gitea/conf/app.ini.j2
+++ b/app-configs/rinoa/gitea/conf/app.ini.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 APP_NAME = Gitea: Git with a cup of tea
 RUN_MODE = prod
diff --git a/app-configs/rinoa/gitea/gitea-sonarqube-bot/config.yaml.j2 b/app-configs/rinoa/gitea/gitea-sonarqube-bot/config.yaml.j2
index d5be6ec..ef4c28a 100644
--- a/app-configs/rinoa/gitea/gitea-sonarqube-bot/config.yaml.j2
+++ b/app-configs/rinoa/gitea/gitea-sonarqube-bot/config.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 # Gitea related configuration. Necessary for adding/updating comments on repository pull requests
 gitea:
diff --git a/app-configs/rinoa/homepage/bookmarks.yaml.j2 b/app-configs/rinoa/homepage/bookmarks.yaml.j2
index 3213604..91d51eb 100644
--- a/app-configs/rinoa/homepage/bookmarks.yaml.j2
+++ b/app-configs/rinoa/homepage/bookmarks.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 
 ---
diff --git a/app-configs/rinoa/homepage/docker.yaml.j2 b/app-configs/rinoa/homepage/docker.yaml.j2
index 58f2932..04c4909 100644
--- a/app-configs/rinoa/homepage/docker.yaml.j2
+++ b/app-configs/rinoa/homepage/docker.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 
 ---
diff --git a/app-configs/rinoa/homepage/kubernetes.yaml.j2 b/app-configs/rinoa/homepage/kubernetes.yaml.j2
index edc81b1..d00e2de 100644
--- a/app-configs/rinoa/homepage/kubernetes.yaml.j2
+++ b/app-configs/rinoa/homepage/kubernetes.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 
 ---
diff --git a/app-configs/rinoa/homepage/services.yaml.j2 b/app-configs/rinoa/homepage/services.yaml.j2
index 6ff90d0..b510e12 100644
--- a/app-configs/rinoa/homepage/services.yaml.j2
+++ b/app-configs/rinoa/homepage/services.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 ---
 # For configuration options and examples, please see:
diff --git a/app-configs/rinoa/homepage/settings.yaml.j2 b/app-configs/rinoa/homepage/settings.yaml.j2
index cdfebde..27938b9 100644
--- a/app-configs/rinoa/homepage/settings.yaml.j2
+++ b/app-configs/rinoa/homepage/settings.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 ---
 # For configuration options and examples, please see:
diff --git a/app-configs/rinoa/homepage/widgets.yaml.j2 b/app-configs/rinoa/homepage/widgets.yaml.j2
index 0e4f004..afefff9 100644
--- a/app-configs/rinoa/homepage/widgets.yaml.j2
+++ b/app-configs/rinoa/homepage/widgets.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 ---
 # For configuration options and examples, please see:
diff --git a/app-configs/rinoa/invidious/config.yml.j2 b/app-configs/rinoa/invidious/config.yml.j2
index c1d8892..1e0c01e 100644
--- a/app-configs/rinoa/invidious/config.yml.j2
+++ b/app-configs/rinoa/invidious/config.yml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 #########################################
 #
 #  Database and other external servers
diff --git a/app-configs/rinoa/invoice-ninja/invoice-ninja.env.j2 b/app-configs/rinoa/invoice-ninja/invoice-ninja.env.j2
index 5782d62..b06b378 100644
--- a/app-configs/rinoa/invoice-ninja/invoice-ninja.env.j2
+++ b/app-configs/rinoa/invoice-ninja/invoice-ninja.env.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 # IN application vars
 IN_APP_URL=https://biz.trez.wtf
diff --git a/app-configs/rinoa/lidarr/config.xml.j2 b/app-configs/rinoa/lidarr/config.xml.j2
index 2650104..976902b 100644
--- a/app-configs/rinoa/lidarr/config.xml.j2
+++ b/app-configs/rinoa/lidarr/config.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 <Config>
   <BindAddress>*</BindAddress>
diff --git a/app-configs/rinoa/lidify/config.json.j2 b/app-configs/rinoa/lidify/config.json.j2
index de8a287..47dbd5a 100644
--- a/app-configs/rinoa/lidify/config.json.j2
+++ b/app-configs/rinoa/lidify/config.json.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 {
     "lidarr_address": "http://lidarr:8686",
diff --git a/app-configs/rinoa/loggifly/config.yaml.j2 b/app-configs/rinoa/loggifly/config.yaml.j2
index 9b261b2..642781c 100644
--- a/app-configs/rinoa/loggifly/config.yaml.j2
+++ b/app-configs/rinoa/loggifly/config.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 containers:
   # adguard:
   #   action_keywords:
diff --git a/app-configs/rinoa/mgob/config/default_mbd_bkup.yaml.j2 b/app-configs/rinoa/mgob/config/default_mbd_bkup.yaml.j2
index 0f80652..7f8fcd3 100644
--- a/app-configs/rinoa/mgob/config/default_mbd_bkup.yaml.j2
+++ b/app-configs/rinoa/mgob/config/default_mbd_bkup.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 scheduler:
   cron: "45 23 * * *" # run every day at 6:00 and 18:00 UTC
   retention: 14 # Retains 14 local backups
diff --git a/app-configs/rinoa/postal/postal.yml.j2 b/app-configs/rinoa/postal/postal.yml.j2
index c12aac5..089e422 100644
--- a/app-configs/rinoa/postal/postal.yml.j2
+++ b/app-configs/rinoa/postal/postal.yml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 version: 2
 
diff --git a/app-configs/rinoa/prowlarr/config.xml.j2 b/app-configs/rinoa/prowlarr/config.xml.j2
index b19e2be..b2dcc02 100644
--- a/app-configs/rinoa/prowlarr/config.xml.j2
+++ b/app-configs/rinoa/prowlarr/config.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 <Config>
   <BindAddress>*</BindAddress>
diff --git a/app-configs/rinoa/qbittorrent/qbit_manage/config.yml.j2 b/app-configs/rinoa/qbittorrent/qbit_manage/config.yml.j2
index 390eba9..9d9a32f 100644
--- a/app-configs/rinoa/qbittorrent/qbit_manage/config.yml.j2
+++ b/app-configs/rinoa/qbittorrent/qbit_manage/config.yml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 # This is an example configuration file that documents all the options.
 # It will need to be modified for your specific use case.
 # These are not default values. You MUST review the config settings and properly configure this EXAMPLE file.
diff --git a/app-configs/rinoa/radarec/config.json.j2 b/app-configs/rinoa/radarec/config.json.j2
index f088471..0fe6081 100644
--- a/app-configs/rinoa/radarec/config.json.j2
+++ b/app-configs/rinoa/radarec/config.json.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 {
     "radarr_address": "http://radarr:7878",
diff --git a/app-configs/rinoa/radarr/config.xml.j2 b/app-configs/rinoa/radarr/config.xml.j2
index 455d7d5..9b93673 100644
--- a/app-configs/rinoa/radarr/config.xml.j2
+++ b/app-configs/rinoa/radarr/config.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 <Config>
   <LogLevel>info</LogLevel>
diff --git a/app-configs/rinoa/sabnzbdvpn/sabnzbd.ini.j2 b/app-configs/rinoa/sabnzbdvpn/sabnzbd.ini.j2
index ca127a4..dda880d 100644
--- a/app-configs/rinoa/sabnzbdvpn/sabnzbd.ini.j2
+++ b/app-configs/rinoa/sabnzbdvpn/sabnzbd.ini.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 __version__ = 19
 __encoding__ = utf-8
diff --git a/app-configs/rinoa/scrutiny/config/config.yaml.j2 b/app-configs/rinoa/scrutiny/config/config.yaml.j2
index e192a93..f37187c 100644
--- a/app-configs/rinoa/scrutiny/config/config.yaml.j2
+++ b/app-configs/rinoa/scrutiny/config/config.yaml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 bolt-path: /opt/scrutiny/influxdb/influxd.bolt
 engine-path: /opt/scrutiny/influxdb/engine
diff --git a/app-configs/rinoa/searxng/settings.yml.j2 b/app-configs/rinoa/searxng/settings.yml.j2
index 6a23677..0b368e9 100644
--- a/app-configs/rinoa/searxng/settings.yml.j2
+++ b/app-configs/rinoa/searxng/settings.yml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 general:
   # Debug mode, only for development. Is overwritten by ${SEARXNG_DEBUG}
diff --git a/app-configs/rinoa/searxng/uwsgi.ini.j2 b/app-configs/rinoa/searxng/uwsgi.ini.j2
index d318c9e..ce65a2e 100644
--- a/app-configs/rinoa/searxng/uwsgi.ini.j2
+++ b/app-configs/rinoa/searxng/uwsgi.ini.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 [uwsgi]
 # Listening address
 # default value: [::]:8080 (see Dockerfile)
diff --git a/app-configs/rinoa/signoz/common/clickhouse/cluster.ha.xml.j2 b/app-configs/rinoa/signoz/common/clickhouse/cluster.ha.xml.j2
index ec19431..bac8b8e 100644
--- a/app-configs/rinoa/signoz/common/clickhouse/cluster.ha.xml.j2
+++ b/app-configs/rinoa/signoz/common/clickhouse/cluster.ha.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 <?xml version="1.0"?>
 <clickhouse>
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
diff --git a/app-configs/rinoa/signoz/common/clickhouse/cluster.xml.j2 b/app-configs/rinoa/signoz/common/clickhouse/cluster.xml.j2
index 115bd1a..9d79dc3 100644
--- a/app-configs/rinoa/signoz/common/clickhouse/cluster.xml.j2
+++ b/app-configs/rinoa/signoz/common/clickhouse/cluster.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 <?xml version="1.0"?>
 <clickhouse>
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
diff --git a/app-configs/rinoa/signoz/common/clickhouse/config.xml.j2 b/app-configs/rinoa/signoz/common/clickhouse/config.xml.j2
index 2251d3b..7e2d80d 100644
--- a/app-configs/rinoa/signoz/common/clickhouse/config.xml.j2
+++ b/app-configs/rinoa/signoz/common/clickhouse/config.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 <?xml version="1.0"?>
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
diff --git a/app-configs/rinoa/signoz/common/clickhouse/custom-function.xml.j2 b/app-configs/rinoa/signoz/common/clickhouse/custom-function.xml.j2
index 479ad4a..ce114d6 100644
--- a/app-configs/rinoa/signoz/common/clickhouse/custom-function.xml.j2
+++ b/app-configs/rinoa/signoz/common/clickhouse/custom-function.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 <functions>
     <function>
         <type>executable</type>
diff --git a/app-configs/rinoa/signoz/common/clickhouse/storage.xml.j2 b/app-configs/rinoa/signoz/common/clickhouse/storage.xml.j2
index b6e6948..c620825 100644
--- a/app-configs/rinoa/signoz/common/clickhouse/storage.xml.j2
+++ b/app-configs/rinoa/signoz/common/clickhouse/storage.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 <?xml version="1.0"?>
 <clickhouse>
 <storage_configuration>
diff --git a/app-configs/rinoa/signoz/common/clickhouse/users.xml.j2 b/app-configs/rinoa/signoz/common/clickhouse/users.xml.j2
index 799dcba..fcb9d13 100644
--- a/app-configs/rinoa/signoz/common/clickhouse/users.xml.j2
+++ b/app-configs/rinoa/signoz/common/clickhouse/users.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 <?xml version="1.0"?>
 <clickhouse>
     <!-- See also the files in users.d directory where the settings can be overridden. -->
diff --git a/app-configs/rinoa/sonarr/config.xml.j2 b/app-configs/rinoa/sonarr/config.xml.j2
index 40db8cf..eeb30b0 100644
--- a/app-configs/rinoa/sonarr/config.xml.j2
+++ b/app-configs/rinoa/sonarr/config.xml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 <Config>
   <LogLevel>info</LogLevel>
diff --git a/app-configs/rinoa/sonashow/config.json.j2 b/app-configs/rinoa/sonashow/config.json.j2
index 9ef31e8..ee07308 100644
--- a/app-configs/rinoa/sonashow/config.json.j2
+++ b/app-configs/rinoa/sonashow/config.json.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 {
     "sonarr_address": "http://192.168.1.2:8989",
diff --git a/app-configs/rinoa/soularr/config.ini.j2 b/app-configs/rinoa/soularr/config.ini.j2
index 5e697b6..1b626a5 100644
--- a/app-configs/rinoa/soularr/config.ini.j2
+++ b/app-configs/rinoa/soularr/config.ini.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 [Lidarr]
 api_key = {{ vault.kv2_field('env','LIDARR_API_KEY', vault_engine_mount_point) }}
diff --git a/app-configs/rinoa/soulseek/slskd.yml.j2 b/app-configs/rinoa/soulseek/slskd.yml.j2
index e5469ab..b73d8b4 100644
--- a/app-configs/rinoa/soulseek/slskd.yml.j2
+++ b/app-configs/rinoa/soulseek/slskd.yml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 directories:
   incomplete: /app/incomplete
diff --git a/app-configs/rinoa/unmanic/settings.json.j2 b/app-configs/rinoa/unmanic/settings.json.j2
index 3780f97..57e4eb7 100644
--- a/app-configs/rinoa/unmanic/settings.json.j2
+++ b/app-configs/rinoa/unmanic/settings.json.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 {
     "always_keep_failed_tasks": true,
diff --git a/app-configs/rinoa/youtubedl/config.yml.j2 b/app-configs/rinoa/youtubedl/config.yml.j2
index cead77f..00704dc 100644
--- a/app-configs/rinoa/youtubedl/config.yml.j2
+++ b/app-configs/rinoa/youtubedl/config.yml.j2
@@ -1,5 +1,5 @@
-{% set vault_addr = 'https://vault.trez.wtf' %}
-{% set secrets_path = 'rinoa-docker/env' %}
+{% import 'app-configs/_macros/hashivault_kv2.j2' as vault %}
+
 
 ydl_server:   # youtube-dl-server specific settings
   port: 8080      # Port youtube-dl-server should listen on