From 19efa2072bf7b616325d74879b0d9f026e53c4df Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Thu, 1 Sep 2022 22:59:10 +0100 Subject: [PATCH] adding some additional variables for backup tasks --- roles/docker_backup/defaults/main.yml | 2 -- roles/docker_s3_backup/defaults/main.yml | 3 +++ .../handlers/main.yml | 0 roles/{docker_backup => docker_s3_backup}/meta/main.yml | 0 roles/{docker_backup => docker_s3_backup}/tasks/main.yml | 9 ++++----- roles/{docker_backup => docker_s3_backup}/vars/main.yml | 0 6 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 roles/docker_backup/defaults/main.yml create mode 100644 roles/docker_s3_backup/defaults/main.yml rename roles/{docker_backup => docker_s3_backup}/handlers/main.yml (100%) rename roles/{docker_backup => docker_s3_backup}/meta/main.yml (100%) rename roles/{docker_backup => docker_s3_backup}/tasks/main.yml (88%) rename roles/{docker_backup => docker_s3_backup}/vars/main.yml (100%) diff --git a/roles/docker_backup/defaults/main.yml b/roles/docker_backup/defaults/main.yml deleted file mode 100644 index 85ffdba..0000000 --- a/roles/docker_backup/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for chatton.docker_backup diff --git a/roles/docker_s3_backup/defaults/main.yml b/roles/docker_s3_backup/defaults/main.yml new file mode 100644 index 0000000..fce0eef --- /dev/null +++ b/roles/docker_s3_backup/defaults/main.yml @@ -0,0 +1,3 @@ +--- +# defaults file for chatton.docker_backup +docker_host_backups_directory: /mnt/mergerfs/backups diff --git a/roles/docker_backup/handlers/main.yml b/roles/docker_s3_backup/handlers/main.yml similarity index 100% rename from roles/docker_backup/handlers/main.yml rename to roles/docker_s3_backup/handlers/main.yml diff --git a/roles/docker_backup/meta/main.yml b/roles/docker_s3_backup/meta/main.yml similarity index 100% rename from roles/docker_backup/meta/main.yml rename to roles/docker_s3_backup/meta/main.yml diff --git a/roles/docker_backup/tasks/main.yml b/roles/docker_s3_backup/tasks/main.yml similarity index 88% rename from roles/docker_backup/tasks/main.yml rename to roles/docker_s3_backup/tasks/main.yml index 78509fb..d27fdc0 100644 --- a/roles/docker_backup/tasks/main.yml +++ b/roles/docker_s3_backup/tasks/main.yml @@ -4,7 +4,8 @@ # https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes -- set_fact: backup_time="{{ ansible_date_time.iso8601 }}" +- name: Determine backup timestamp. + set_fact: backup_time="{{ ansible_date_time.iso8601 }}" - name: Stop a container community.docker.docker_container: @@ -19,8 +20,6 @@ - name: Extract only the volume mounts (not bind mounts) set_fact: volume_mounts="{{ result.container.Mounts | selectattr("Type", "equalto", "volume")}}" -- debug: msg="{{volume_mounts}}" - - name: Create Backup of Container Volumes community.docker.docker_container: name: "backup-container-{{ item.Name }}-{{ 10 | random }}" @@ -31,7 +30,7 @@ state: started volumes: - "{{ item.Name }}:/data" - - /mnt/mergerfs/backups:/backups + - "{{ docker_host_backups_directory }}":/backups with_items: "{{ volume_mounts }}" - name: Start the container @@ -45,7 +44,7 @@ s3_url: "https://{{aws_s3.s3_url}}" bucket: "{{ aws_s3.bucket }}" object: "{{ item.Name }}/{{ item.Name }}-{{ backup_time }}.tar.gz" - src: /mnt/mergerfs/backups/{{ item.Name }}-{{ backup_time }}.tar.gz + src: {{ docker_host_backups_directory }}/{{ item.Name }}-{{ backup_time }}.tar.gz aws_access_key: "{{ aws_s3.aws_access_key }}" aws_secret_key: "{{ aws_s3.aws_secret_key }}" region: "{{ aws_s3.region }}" diff --git a/roles/docker_backup/vars/main.yml b/roles/docker_s3_backup/vars/main.yml similarity index 100% rename from roles/docker_backup/vars/main.yml rename to roles/docker_s3_backup/vars/main.yml