Optimized svc-bkp-rmt-2-loc and moved conf into role config

roles/svc-bkp-rmt-2-loc/Administration.md

@@ -9,17 +9,17 @@ To track what the service is doing, execute one of the following commands:
 #### Using systemctl
 
 ```bash
-watch -n2 "systemctl status sys-bkp-remote-to-local.cymais.service"
+watch -n2 "systemctl status sys-bkp-rmt-2-loc.cymais.service"
 ```
 
 #### Using journalctl
 
 ```bash
-journalctl -fu sys-bkp-remote-to-local.cymais.service
+journalctl -fu sys-bkp-rmt-2-loc.cymais.service
 ```
 
 ### Viewing History
 
 ```bash
-sudo journalctl -u sys-bkp-remote-to-local.cymais.service
+sudo journalctl -u sys-bkp-rmt-2-loc.cymais.service
 ```

roles/svc-bkp-rmt-2-loc/config/main.yml

@@ -0,0 +1 @@
+backup_providers:  [] # List of providers to pull the backups from

roles/svc-bkp-rmt-2-loc/tasks/main.yml

@@ -16,10 +16,10 @@
     dest: /etc/systemd/system/svc-bkp-rmt-2-loc.cymais.service
   notify: reload svc-bkp-rmt-2-loc service
 
-- name: create backups-remote-to-local.sh
+- name: create sys-bkp-rmt-2-loc-multi-provider.sh
   template: 
-    src: backups-remote-to-local.sh.j2 
-    dest: "{{docker_backup_remote_to_local_folder}}backups-remote-to-local.sh"
+    src: sys-bkp-rmt-2-loc-multi-provider.sh.j2 
+    dest: "{{docker_backup_remote_to_local_folder}}sys-bkp-rmt-2-loc-multi-provider.sh"
     mode: 0755
 
 - name: "set 'service_name' to '{{ role_name }}'"

roles/svc-bkp-rmt-2-loc/templates/sys-bkp-rmt-2-loc-multi-provider.sh.j2

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Pulls the remote backups from multiple hosts
-hosts="{{ pull_remote_backups | join(' ') }}";
+hosts="{{ rmt2loc_backup_providers | join(' ') }}";
 errors=0
 for host in $hosts; do
   bash {{ docker_backup_remote_to_local_folder }}svc-bkp-rmt-2-loc.sh $host || ((errors+=1));

roles/svc-bkp-rmt-2-loc/templates/sys-bkp-rmt-2-loc.service.j2

@@ -5,4 +5,4 @@ OnFailure=sys-alm-compose.cymais@%n.service sys-cln-faild-bkps.cymais.service
 [Service]
 Type=oneshot
 ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ')  }} --ignore {{system_maintenance_backup_services| join(' ') }} --timeout "{{system_maintenance_lock_timeout_backup_services}}"'
-ExecStart=/bin/sh -c '/usr/bin/bash {{docker_backup_remote_to_local_folder}}backups-remote-to-local.sh'
+ExecStart=/bin/sh -c '/usr/bin/bash {{docker_backup_remote_to_local_folder}}sys-bkp-rmt-2-loc-multi-provider.sh'

roles/svc-bkp-rmt-2-loc/vars/main.yml

@@ -1,2 +1,3 @@
-docker_backup_remote_to_local_folder: '{{path_administrator_scripts}}svc-bkp-rmt-2-loc/'
 application_id: svc-bkp-rmt-2-loc
+docker_backup_remote_to_local_folder: '{{ path_administrator_scripts }}{{ application_id }}/'
+rmt2loc_backup_providers: "{{ applications | get_app_conf(application_id, 'backup_providers')  }}"