diff --git a/tasks/main.yml b/tasks/main.yml index 76b0e601ae4049d25f189529c5a308bd3e1444bc..61e63f7d4bb5b579918240396600f8af93f25194 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -30,9 +30,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 32a557b380c83ab783f98639df496dcb38ec324f..a8b9603a5e48d389a1eb5f70c30d8e9dfa429d19 100644 --- a/templates/backup.yaml.j2 +++ b/templates/backup.yaml.j2 @@ -20,10 +20,9 @@ services: SWIFT_TENANTNAME: "{{ swift_odoo_tenantname }}" SWIFT_TENANTID: "{{ swift_odoo_tenantid }}" SWIFT_REGIONNAME: "{{ swift_odoo_regionname }}" - JOB_300_WHAT: "backup --full-if-older-than 6D" + JOB_300_WHAT: "mysqldump -h $$MYSQL_HOST -u $$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE --result-file='$$SRC/mysql_$${MYSQL_HOST}_$$MYSQL_DATABASE.sql' && backup --full-if-older-than 6D && rm '$$SRC/mysql_$${MYSQL_HOST}_$$MYSQL_DATABASE.sql'" JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@" JOB_302_WHEN: "daily" - OPTIONS: "--allow-source-mismatch" networks: - framadate_default - public diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2 index df531ec677a769b99a2deba6f700a9f22d856f20..d9a590199c614376f151c54433f4add5405806a6 100644 --- a/templates/backup2.yaml.j2 +++ b/templates/backup2.yaml.j2 @@ -20,10 +20,9 @@ services: SWIFT_TENANTNAME: "{{ swift_odoo2_tenantname }}" SWIFT_TENANTID: "{{ swift_odoo2_tenantid }}" SWIFT_REGIONNAME: "{{ swift_odoo2_regionname }}" - JOB_300_WHAT: "backup --full-if-older-than 6D" + JOB_300_WHAT: "mysqldump -h $$MYSQL_HOST -u $$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE --result-file='$$SRC/mysql_$${MYSQL_HOST}_$$MYSQL_DATABASE.sql' && backup --full-if-older-than 6D && rm '$$SRC/mysql_$${MYSQL_HOST}_$$MYSQL_DATABASE.sql'" JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@" JOB_302_WHEN: "daily" - OPTIONS: "--allow-source-mismatch" networks: - framadate_default - public