diff --git a/Ansible/roles/backup_lxc_containers/tasks/main.yml b/Ansible/roles/backup_lxc_containers/tasks/main.yml index e76e7ec5..30100406 100644 --- a/Ansible/roles/backup_lxc_containers/tasks/main.yml +++ b/Ansible/roles/backup_lxc_containers/tasks/main.yml @@ -28,13 +28,13 @@ loop: "{{ (list_backup_dirs.files | sort(attribute='ctime'))[:-backup_retention] }}" when: list_backup_dirs.files | length > backup_retention -- name: "List backup directories" +- name: "Get backup directories names and sizes" ansible.builtin.shell: - cmd: ls -ltrh "{{ backup_base_dir }}" - register: ls_backup_dirs + cmd: du -hd1 "{{ backup_base_dir }}" + register: size_backup_dirs changed_when: false - name: "Show backup directories" ansible.builtin.debug: - msg: "{{ ls_backup_dirs.stdout_lines }}" - when: ls_backup_dirs.stdout_lines | length > 0 + msg: "{{ size_backup_dirs.stdout_lines }}" + when: size_backup_dirs.stdout_lines | length > 0 diff --git a/Ansible/roles/backup_podman_containers_volumes/tasks/main.yml b/Ansible/roles/backup_podman_containers_volumes/tasks/main.yml index 5fc820b6..c3634ddc 100644 --- a/Ansible/roles/backup_podman_containers_volumes/tasks/main.yml +++ b/Ansible/roles/backup_podman_containers_volumes/tasks/main.yml @@ -28,13 +28,13 @@ loop: "{{ (list_backup_dirs.files | sort(attribute='ctime'))[:-backup_retention] }}" when: list_backup_dirs.files | length > backup_retention -- name: "List backup directories" +- name: "Get backup directories names and sizes" ansible.builtin.shell: - cmd: ls -ltrh "{{ backup_base_dir }}" - register: ls_backup_dirs + cmd: du -hd1 "{{ backup_base_dir }}" + register: size_backup_dirs changed_when: false - + - name: "Show backup directories" ansible.builtin.debug: - msg: "{{ ls_backup_dirs.stdout_lines }}" - when: ls_backup_dirs.stdout_lines | length > 0 + msg: "{{ size_backup_dirs.stdout_lines }}" + when: size_backup_dirs.stdout_lines | length > 0 diff --git a/Ansible/roles/backup_qemu_vms/tasks/main.yml b/Ansible/roles/backup_qemu_vms/tasks/main.yml index 3d8e008b..38d3c34c 100644 --- a/Ansible/roles/backup_qemu_vms/tasks/main.yml +++ b/Ansible/roles/backup_qemu_vms/tasks/main.yml @@ -28,13 +28,13 @@ loop: "{{ (list_backup_dirs.files | sort(attribute='ctime'))[:-backup_retention] }}" when: list_backup_dirs.files | length > backup_retention -- name: "List backup directories" +- name: "Get backup directories names and sizes" ansible.builtin.shell: - cmd: ls -ltrh "{{ backup_base_dir }}" - register: ls_backup_dirs + cmd: du -hd1 "{{ backup_base_dir }}" + register: size_backup_dirs changed_when: false - name: "Show backup directories" ansible.builtin.debug: - msg: "{{ ls_backup_dirs.stdout_lines }}" - when: ls_backup_dirs.stdout_lines | length > 0 + msg: "{{ size_backup_dirs.stdout_lines }}" + when: size_backup_dirs.stdout_lines | length > 0 diff --git a/Ansible/roles/core_system_backup/tasks/main.yml b/Ansible/roles/core_system_backup/tasks/main.yml index 2725e17e..10f45f8a 100644 --- a/Ansible/roles/core_system_backup/tasks/main.yml +++ b/Ansible/roles/core_system_backup/tasks/main.yml @@ -12,13 +12,13 @@ msg: "{{ core_system_backup.stdout_lines }}" when: core_system_backup.stdout_lines | length > 0 -- name: "List Core System Backup archives" +- name: "Get backup directories names and sizes" ansible.builtin.shell: - cmd: ls -ltrh /backup/System_Backup - register: core_system_backup_list_archives + cmd: du -hd1 /backup/system/ + register: size_backup_dirs changed_when: false -- name: "Show Core System Backup archives list" +- name: "Show backup directories" ansible.builtin.debug: - msg: "{{ core_system_backup_list_archives.stdout_lines }}" - when: core_system_backup_list_archives.stdout_lines | length > 0 + msg: "{{ size_backup_dirs.stdout_lines }}" + when: size_backup_dirs.stdout_lines | length > 0 diff --git a/Ansible/roles/vps_system_backup/tasks/main.yml b/Ansible/roles/vps_system_backup/tasks/main.yml index eabc7afb..6b5c2771 100644 --- a/Ansible/roles/vps_system_backup/tasks/main.yml +++ b/Ansible/roles/vps_system_backup/tasks/main.yml @@ -3,7 +3,7 @@ - name: "VPS System Backup" ansible.builtin.shell: - cmd: cd /opt/VPS_Backup && rsync -aAXHv --delete --exclude='/dev/*' --exclude='/proc/*' --exclude='/sys/*' --exclude='/tmp/*' --exclude='/run/*' --exclude='/mnt/*' --exclude='/media/*' --exclude='/lost+found/' --exclude='/swap/' --exclude='/var/cache/pacman/pkg/*' --exclude='/var/lib/archbuild/*' --exclude='/var/lib/aurbuild/*' --exclude='/var/lib/docker/*' --exclude='/opt/crystal/*' --exclude='/opt/VPS_Backup/*' / $(date +%d-%m-%Y) && tar -czvf $(date +%d-%m-%Y).tar.gz $(date +%d-%m-%Y) && gpg --symmetric --batch --passphrase-file .passwd --cipher-algo AES256 -c $(date +%d-%m-%Y).tar.gz && rm -rf $(date +%d-%m-%Y) $(date +%d-%m-%Y).tar.gz && ls -ltrh + cmd: cd /opt/VPS_Backup && rsync -aAXHv --delete --exclude='/dev/*' --exclude='/proc/*' --exclude='/sys/*' --exclude='/tmp/*' --exclude='/run/*' --exclude='/mnt/*' --exclude='/media/*' --exclude='/lost+found/' --exclude='/swap/' --exclude='/var/cache/pacman/pkg/*' --exclude='/var/lib/archbuild/*' --exclude='/var/lib/aurbuild/*' --exclude='/var/lib/docker/*' --exclude='/opt/crystal/*' --exclude='/opt/VPS_Backup/*' / $(date +%d-%m-%Y) && tar -czvf $(date +%d-%m-%Y).tar.gz $(date +%d-%m-%Y) && gpg --symmetric --batch --passphrase-file .passwd --cipher-algo AES256 -c $(date +%d-%m-%Y).tar.gz && rm -rf $(date +%d-%m-%Y) $(date +%d-%m-%Y).tar.gz && du hd1 . register: vps_system_backup changed_when: true @@ -49,7 +49,7 @@ - name: "Get backup archives in FileBrowser" ansible.builtin.shell: - cmd: ls -ltrh /data/FileBrowser/data/VPS_Backup + cmd: du -hd1 /data/FileBrowser/data/VPS_Backup register: list_backup_archives_filebrowser changed_when: false delegate_to: fsprd01.rc