Updates for better usability

This commit is contained in:
Chris Hammer 2025-03-04 17:28:33 -05:00
parent 0a13ff232b
commit 612dcfc732
2 changed files with 13 additions and 17 deletions

View File

@ -8,7 +8,13 @@
when: when:
- rear_backup_log_stat['stat']['exists'] - rear_backup_log_stat['stat']['exists']
block: block:
- name: Copy ReaR log file to backup location - name: Validate ReaR backup completion
ansible.builtin.command:
cmd: "grep 'Finished running mkbackup workflow' /var/log/rear/rear-{{ ansible_hostname }}.log"
register: rear_backup_validate
failed_when: rear_backup_validate['rc'] not in [0]
- name: Backup ReaR log file
ansible.builtin.copy: ansible.builtin.copy:
src: "/var/log/rear/rear-{{ ansible_hostname }}.log" src: "/var/log/rear/rear-{{ ansible_hostname }}.log"
dest: "/var/log/rear-{{ ansible_hostname }}-{{ '%Y-%m-%d' | strftime(rear_backup_log_stat['stat']['mtime']) }}.log" dest: "/var/log/rear-{{ ansible_hostname }}-{{ '%Y-%m-%d' | strftime(rear_backup_log_stat['stat']['mtime']) }}.log"

View File

@ -1,21 +1,11 @@
--- ---
- name: Check for backup log presence - name: Check for previous backup completion
ansible.builtin.stat: ansible.builtin.stat:
path: "/var/log/rear/rear-{{ ansible_hostname }}.log" path: "{{ rear_backup_success_file_path }}/{{ rear_backup_workflow }}_rear_success"
register: rear_backup_log_presence register: rear_backup_success_file
- name: End host if ReaR backup already exists - name: End if backup has already completed successfully
ansible.builtin.meta: end_host
when: when:
- rear_backup_log_presence['stat']['exists'] | bool - rear_backup_success_file['stat']['exists'] | bool
- not rear_force_backup | default(false) | bool - not rear_force_backup | default(false) | bool
block:
- name: Validate ReaR backup completion
ansible.builtin.command:
cmd: "grep 'Finished running mkbackup workflow' /var/log/rear/rear-{{ ansible_hostname }}.log"
register: validate_backup_log
failed_when: validate_backup_log['rc'] not in [0,1]
- name: End play if ReaR already exists
ansible.builtin.meta: end_host
when:
- validate_backup_log['rc'] == 0