From 5adce08aea0cf16616dd2065b58613ae618ae5c2 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Mon, 18 Aug 2025 21:26:46 +0200
Subject: [PATCH] Optimized variable names

---
 roles/svc-bkp-rmt-2-loc/tasks/main.yml         | 2 +-
 roles/svc-bkp-rmt-2-loc/templates/script.sh.j2 | 4 ++--
 roles/svc-bkp-rmt-2-loc/vars/main.yml          | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/roles/svc-bkp-rmt-2-loc/tasks/main.yml b/roles/svc-bkp-rmt-2-loc/tasks/main.yml
index 6feed3a2..8218f801 100644
--- a/roles/svc-bkp-rmt-2-loc/tasks/main.yml
+++ b/roles/svc-bkp-rmt-2-loc/tasks/main.yml
@@ -19,7 +19,7 @@
 - name: create svc-bkp-rmt-2-loc.sh
   copy:
     src: svc-bkp-rmt-2-loc.sh
-    dest: "{{ DOCKER_BACKUP_REMOTE_2_LOCAL_DIR }}svc-bkp-rmt-2-loc.sh"
+    dest: "{{ DOCKER_BACKUP_REMOTE_2_LOCAL_SCRIPT }}"
     mode: "0755"
 
 - include_role:
diff --git a/roles/svc-bkp-rmt-2-loc/templates/script.sh.j2 b/roles/svc-bkp-rmt-2-loc/templates/script.sh.j2
index afcdf6bb..d1261891 100644
--- a/roles/svc-bkp-rmt-2-loc/templates/script.sh.j2
+++ b/roles/svc-bkp-rmt-2-loc/templates/script.sh.j2
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Pulls the remote backups from multiple hosts
-hosts="{{ rmt2loc_backup_providers | join(' ') }}";
+hosts="{{ DOCKER_BACKUP_REMOTE_2_LOCAL_BACKUP_PROVIDERS | join(' ') }}";
 errors=0
 for host in $hosts; do
-  bash {{ DOCKER_BACKUP_REMOTE_2_LOCAL_DIR }}svc-bkp-rmt-2-loc.sh $host || ((errors+=1));
+  bash {{ DOCKER_BACKUP_REMOTE_2_LOCAL_SCRIPT }} $host || ((errors+=1));
 done;
 exit $errors;
diff --git a/roles/svc-bkp-rmt-2-loc/vars/main.yml b/roles/svc-bkp-rmt-2-loc/vars/main.yml
index 87d0c60e..c6ca8d1b 100644
--- a/roles/svc-bkp-rmt-2-loc/vars/main.yml
+++ b/roles/svc-bkp-rmt-2-loc/vars/main.yml
@@ -1,4 +1,5 @@
-application_id:                   svc-bkp-rmt-2-loc
-systemctl_id:                     "{{ application_id }}"  
-DOCKER_BACKUP_REMOTE_2_LOCAL_DIR: '{{ PATH_ADMINISTRATOR_SCRIPTS }}{{ application_id }}/'
-rmt2loc_backup_providers:         "{{ applications | get_app_conf(application_id, 'backup_providers')  }}"
\ No newline at end of file
+application_id:                                 svc-bkp-rmt-2-loc
+systemctl_id:                                   "{{ application_id }}"  
+DOCKER_BACKUP_REMOTE_2_LOCAL_DIR:               '{{ PATH_ADMINISTRATOR_SCRIPTS }}{{ application_id }}/'
+DOCKER_BACKUP_REMOTE_2_LOCAL_SCRIPT:            "{{ DOCKER_BACKUP_REMOTE_2_LOCAL_DIR }}svc-bkp-rmt-2-loc.sh"
+DOCKER_BACKUP_REMOTE_2_LOCAL_BACKUP_PROVIDERS:  "{{ applications | get_app_conf(application_id, 'backup_providers')  }}"
\ No newline at end of file