backup: rework crontab toggle

saltyorg · Jul 5, 2023 · 2db13ff · 2db13ff
1 parent 29fbd1d
commit 2db13ff
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 27 deletions.
diff --git a/defaults/backup_config.yml.default b/defaults/backup_config.yml.default
@@ -2,7 +2,6 @@
 backup:
   cron:
     cron_time: weekly
-    enable: no
   local:
     destination: /mnt/local/Backups/Saltbox
     enable: true

diff --git a/roles/backup/tasks/cron.yml b/roles/backup/tasks/cron.yml
@@ -23,5 +23,5 @@
     job: >
       sudo PATH='/usr/bin:/bin:/usr/local/bin' env ANSIBLE_CONFIG='{{ playbook_dir }}/ansible.cfg' '{{ playbook_binary.stdout }}'
       {{ playbook_dir }}/backup.yml --tags backup >> '{{ playbook_dir }}/saltbox_backup.log' 2>&1
-    state: "{{ backup.cron.enable | ternary('present', 'absent') }}"
+    state: "{{ ('set-backup' in ansible_run_tags) | ternary('present', 'absent') }}"
     user: "{{ user.name }}"
diff --git a/roles/backup/tasks/main.yml b/roles/backup/tasks/main.yml
@@ -35,13 +35,16 @@
       ansible.builtin.import_tasks: "variables.yml"
       tags:
         - set-backup
+        - unset-backup
         - restore-service
         - saltbox-restore-service
 
     - name: Cron
       ansible.builtin.import_tasks: "cron.yml"
-      when: ('set-backup' in ansible_run_tags) and not ('backup' in ansible_run_tags)
-      tags: set-backup
+      when: (('set-backup' in ansible_run_tags) or ('unset-backup' in ansible_run_tags)) and not ('backup' in ansible_run_tags)
+      tags:
+        - set-backup
+        - unset-backup
 
     - name: Get Current Time
       ansible.builtin.shell: "date \"+%s\""

diff --git a/roles/backup/tasks/variables.yml b/roles/backup/tasks/variables.yml
@@ -22,7 +22,6 @@
       rsync: "{{ backup.rsync | combine(rsync_tmp) }}"
       cron:
         cron_time: "{{ backup.cron.cron_time }}"
-        enable: "{{ backup.cron.enable }}"
       restore_service:
         user: "{{ backup.restore_service.user }}"
         pass: "{{ backup.restore_service.pass }}"

diff --git a/roles/backup2/tasks/cron.yml b/roles/backup2/tasks/cron.yml
@@ -23,5 +23,5 @@
     job: >
       sudo PATH='/usr/bin:/bin:/usr/local/bin' env ANSIBLE_CONFIG='{{ playbook_dir }}/ansible.cfg' '{{ playbook_binary.stdout }}'
       {{ playbook_dir }}/backup.yml --tags backup2 >> '{{ playbook_dir }}/saltbox_backup2.log' 2>&1
-    state: "{{ backup.cron.enable | ternary('present', 'absent') }}"
+    state: "{{ ('set-backup2' in ansible_run_tags) | ternary('present', 'absent') }}"
     user: "{{ user.name }}"
diff --git a/roles/backup2/tasks/main.yml b/roles/backup2/tasks/main.yml
@@ -20,13 +20,16 @@
       ansible.builtin.import_tasks: "variables.yml"
       tags:
         - set-backup2
+        - unset-backup2
         - restore-service2
         - saltbox-restore-service2
 
     - name: Cron
       ansible.builtin.import_tasks: "cron.yml"
-      when: ('set-backup2' in ansible_run_tags) and not ('backup2' in ansible_run_tags)
-      tags: set-backup2
+      when: (('set-backup2' in ansible_run_tags) or ('unset-backup2' in ansible_run_tags)) and not ('backup2' in ansible_run_tags)
+      tags:
+        - set-backup2
+        - unset-backup2
 
     - name: Get Current Time
       ansible.builtin.shell: "date \"+%s\""

diff --git a/roles/backup2/tasks/variables.yml b/roles/backup2/tasks/variables.yml
@@ -22,7 +22,6 @@
       rsync: "{{ backup.rsync | combine(rsync_tmp) }}"
       cron:
         cron_time: "{{ backup.cron.cron_time }}"
-        enable: "{{ backup.cron.enable }}"
       restore_service:
         user: "{{ backup.restore_service.user }}"
         pass: "{{ backup.restore_service.pass }}"

diff --git a/roles/restore/tasks/variables.yml b/roles/restore/tasks/variables.yml
@@ -21,7 +21,6 @@
       rsync: "{{ backup.rsync }}"
       cron:
         cron_time: "{{ backup.cron.cron_time }}"
-        enable: "{{ backup.cron.enable }}"
       restore_service:
         user: "{{ backup.restore_service.user }}"
         pass: "{{ backup.restore_service.pass }}"

diff --git a/roles/settings/tasks/subtasks/migrator/backup_config_yml/migration_01.yml b/roles/settings/tasks/subtasks/migrator/backup_config_yml/migration_01.yml
@@ -10,30 +10,17 @@
 ---
 - name: "Migrator | 'backup_config.yml' | Migration 01 | Set variables"
   ansible.builtin.set_fact:
-    new_settings: "{{ not ((backup is undefined)
+    old_settings: "{{ (backup.cron.enable is defined)
                       or
-                      (backup is none)
-                      or
-                      (backup | trim | length == 0)
-                      or
-                      (backup.cron is undefined)
-                      or
-                      (backup.cron is none)
-                      or
-                      (backup.cron | trim | length == 0)
-                      or
-                      (backup.cron.cron_state is defined)) }}"
+                      (backup.cron.cron_state is defined) }}"
 
 - name: Migrator | 'backup_config.yml' | Migration 01 | Rebuild 'backup.cron' dict
   ansible.builtin.shell: |
     yyq e -i 'del(.backup.cron.cron_state)' {{ playbook_dir }}/{{ file }}
-    yyq e -i '.backup.cron.enable = "{{
-              'yes'
-              if (backup is defined and backup.cron is defined and backup.cron.cron_state is defined and backup.cron.cron_state == "present")
-              else 'no' }}"' {{ playbook_dir }}/{{ file }}
+    yyq e -i 'del(.backup.cron.enable)' {{ playbook_dir }}/{{ file }}
   become: true
   become_user: "{{ saltbox_yml.stat.pw_name }}"
-  when: (not new_settings)
+  when: old_settings
 
 - name: Migrator | 'backup_config.yml' | Migration 01 | Remove 'null' values
   ansible.builtin.replace: