Backup: Cleaner looking tarball creation task [ansible]

desimaniac · desimaniac · commit a7d8418fb2a7 · 2019-05-18T12:01:25.000-05:00
diff --git a/roles/backup/tasks/main.yml b/roles/backup/tasks/main.yml
@@ -80,6 +80,7 @@
       - "/opt/systemd-backup"
       - "/opt/crontab-backup"
 
+  # Backup config files
   - name: "Copy files to '{{ local.destination }}'"
     copy:
       src: "{{ item }}"
@@ -97,6 +98,7 @@
      - "/home/{{ user }}/.config/rclone/rclone.conf"
     ignore_errors: yes
 
+  # Backup the excludes list if it exists
   - name: "Look for 'backup_excludes_list.txt' file in cloudbox folder"
     stat:
       path: "{{ playbook_dir }}/backup_excludes_list.txt"
@@ -112,6 +114,13 @@
       force: yes
     when: (backup_excludes_list.stat.exists)
 
+  - name: Set 'backup_excludes_list_path' variable
+    set_fact:
+      backup_excludes_list_path: "{{
+        (playbook_dir + '/backup_excludes_list.txt')
+        if ((backup_excludes_list is defined) and (backup_excludes_list.stat.exists))
+        else (playbook_dir + '/roles/backup/files/backup_excludes_list.txt') }}"
+
   - name: Cloudbox Restore Service
     import_tasks: "restore_service.yml"
     when: restore_service_enabled
@@ -305,7 +314,7 @@
         --ignore-failed-read \
         --warning=no-file-changed \
         --warning=no-file-removed \
-        --exclude-from '{{ (backup_excludes_list is defined and backup_excludes_list.stat.exists) | ternary(playbook_dir + '/backup_excludes_list.txt', playbook_dir + '/roles/backup/files/backup_excludes_list.txt') }}' \
+        --exclude-from '{{ backup_excludes_list_path }}' \
         -cf '{{ local.destination }}/opt/{{ item | basename }}.tar' -C '{{ item | dirname }}' './{{ item | basename }}' \
         2> /dev/null
     args:
diff --git a/roles/backup/tasks/variables.yml b/roles/backup/tasks/variables.yml
@@ -8,13 +8,13 @@
 #                   GNU General Public License v3.0                     #
 #########################################################################
 ---
-# Set basic variable(s)
+# Set 'user' variable
 - name: "Get 'cloudbox.yml' info."
   stat:
     path: "{{ playbook_dir }}/backup.yml"
   register: backup_yml
 
-- name: Set variables
+- name: Set 'user' variable
   set_fact:
     user: "{{ backup_yml.stat.pw_name }}"
 
@@ -31,6 +31,7 @@
     rclone: "{{ rclone | combine(rclone_tmp) }}"
     rsync: "{{ rsync | combine(rsync_tmp) }}"
 
+# Restore service
 - name: "Set 'restore_service_enabled' variable"
   set_fact:
     restore_service_enabled: "{{ true if not(
