diff --git a/tasks/main.yml b/tasks/main.yml index 43011df0a6f604193888414370f303125335b427..fbda943fe3917ddd8cf5512427405fd4fd5e0fcd 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -35,9 +35,9 @@ mode: '0400' when: inventory_hostname in groups['maintenance_contract'] -- name: Copy docker file for mysql duplicity - copy: - src: ../docker_nextcloud/files/Dockerfile-backup +- name: Get docker file for mysql duplicity from docker_nextcloud role + get_url: + url: "https://sources.le-filament.com/lefilament/ansible-roles/docker_nextcloud/-/raw/master/files/Dockerfile-backup" dest: /home/docker/backups/Dockerfile-mysql owner: root group: root diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2 index d152e1a3d7920a2034460d13ed6266f3bcf55afe..99d745369ca7321e8db84993255c54ab5a5517e3 100644 --- a/templates/backup.yaml.j2 +++ b/templates/backup.yaml.j2 @@ -20,13 +20,10 @@ services: SWIFT_TENANTNAME: "{{ swift_cloud_tenantname }}" SWIFT_TENANTID: "{{ swift_cloud_tenantid }}" SWIFT_REGIONNAME: "{{ swift_cloud_regionname }}" - JOB_200_WHEN: "weekly" - JOB_300_WHAT: "dup full $$SRC $$DST" + JOB_300_WHAT: "mysqldump -h $$MYSQL_HOST -u $$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE --result-file='$$SRC/mysql_$${MYSQL_HOST}_$$MYSQL_DATABASE.sql' && dup full $$SRC $$DST && rm '$$SRC/mysql_$${MYSQL_HOST}_$$MYSQL_DATABASE.sql'" JOB_300_WHEN: "weekly" JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@" JOB_302_WHEN: "weekly" - JOB_700_WHEN: "weekly" - OPTIONS: "--allow-source-mismatch" volumes: - owncloud_owncloud:/mnt/backup/src/owncloud:z - ./owncloud:/backups