From 0ecade32d9be4f60cc02c51f148a9cf66d9831b7 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 09:40:40 +0200
Subject: [PATCH] [ENH] update backup source and command
---
tasks/main.yml | 6 +++---
templates/backup.yaml.j2 | 3 +--
templates/backup2.yaml.j2 | 3 +--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index 76b0e60..61e63f7 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 32a557b..a8b9603 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 df531ec..d9a5901 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
--
GitLab