From ed4f9bfd695babfbdd03da15dda239a41b5c2a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Mon, 8 Aug 2022 10:03:56 +0200
Subject: [PATCH] [ENH] backup image and command

---
 tasks/main.yml           | 6 +++---
 templates/backup.yaml.j2 | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 43011df..fbda943 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 d152e1a..99d7453 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
-- 
GitLab