General optimations

roles/bkp-docker-to-local/tasks/main.yml

@@ -2,57 +2,55 @@
   include_role:
     name: pkgmgr-install
   vars:
-    package_name: bkp-docker-to-local
-  when: run_once_backup_docker_to_local is not defined
+    package_name: "{{ bkp_docker_to_local_pkg }}"
+  when: run_once_bkp_docker_to_local is not defined
 
-- name: Retrieve bkp-docker-to-local path from pkgmgr
-  command: pkgmgr path bkp-docker-to-local
+- name: "Retrieve {{ bkp_docker_to_local_pkg }} path from pkgmgr"
+  command: "pkgmgr path {{ bkp_docker_to_local_pkg }}"
   register: pkgmgr_output
   changed_when: false
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_bkp_docker_to_local is not defined
 
 - name: Set fact for backup_docker_to_local_folder
   set_fact:
     backup_docker_to_local_folder: "{{ pkgmgr_output.stdout }}/"
   changed_when: false
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_bkp_docker_to_local is not defined
+
+- name: "reset (if enabled)"
+  include_tasks: reset.yml 
+  when: mode_reset | bool and run_once_bkp_docker_to_local is not defined
 
 - name: configure bkp-docker-to-local-everything.cymais.service
   template: 
     src: bkp-docker-to-local-everything.service.j2
     dest: /etc/systemd/system/bkp-docker-to-local-everything.cymais.service
   notify: reload bkp-docker-to-local-everything.cymais.service
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_bkp_docker_to_local is not defined
 
 - name: configure bkp-docker-to-local.cymais.service
   template: 
     src: bkp-docker-to-local.service.j2
     dest: /etc/systemd/system/bkp-docker-to-local.cymais.service
   notify: reload bkp-docker-to-local.cymais.service
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_bkp_docker_to_local is not defined
 
-- name: set service_name to the name of the current role
+- name: "set 'service_name' to '{{ role_name }}'"
   set_fact:
     service_name: "{{ role_name }}"
-  when: run_once_backup_docker_to_local is not defined
+  when: run_once_bkp_docker_to_local is not defined
 
 - name: "include role for gen-timer for {{service_name}}"
   include_role:
     name: gen-timer
   vars:
     on_calendar:  "{{on_calendar_backup_docker_to_local}}"
-  when: run_once_backup_docker_to_local is not defined
-
-- name: "reset {{ backup_docker_to_local_folder }}databases.csv"
-  file:
-    path: "{{ backup_docker_to_local_folder }}databases.csv"
-    state: absent
-  when: mode_reset | bool and run_once_backup_docker_to_local is not defined
+  when: run_once_bkp_docker_to_local is not defined
 
 - name: "include seed-database-to-backup.yml"
   include_tasks: seed-database-to-backup.yml
 
 - name: run the backup_docker_to_local tasks once
   set_fact:
-    run_once_backup_docker_to_local: true
-  when: run_once_backup_docker_to_local is not defined
+    run_once_bkp_docker_to_local: true
+  when: run_once_bkp_docker_to_local is not defined

roles/bkp-docker-to-local/tasks/reset.yml

@@ -0,0 +1,4 @@
+- name: "reset {{ backup_docker_to_local_folder }}databases.csv"
+  file:
+    path: "{{ backup_docker_to_local_folder }}databases.csv"
+    state: absent

roles/bkp-docker-to-local/tasks/seed-database-to-backup.yml

@@ -51,10 +51,10 @@
     database_name is defined and
     database_username is defined and
     database_password is defined) and
-    run_once_backup_docker_to_local_file_permission is not defined
+    run_once_bkp_docker_to_local_file_permission is not defined
   register: file_permission_result
 
 - name: run the backup_docker_to_local_file_permission tasks once
   set_fact:
-    run_once_backup_docker_to_local_file_permission: true
-  when: run_once_backup_docker_to_local_file_permission is not defined and file_permission_result is defined and file_permission_result.changed
+    run_once_bkp_docker_to_local_file_permission: true
+  when: run_once_bkp_docker_to_local_file_permission is not defined and file_permission_result is defined and file_permission_result.changed