From 1830948f575a6f79cdd81880d10028d72939b069 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:02:46 +0200
Subject: [PATCH] [FIX] make backups fail if db cannot be dumped
---
templates/backup.yaml.j2 | 4 ++--
templates/backup2.yaml.j2 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2
index 13415fe..4a6b01e 100644
--- a/templates/backup.yaml.j2
+++ b/templates/backup.yaml.j2
@@ -17,8 +17,8 @@ services:
SWIFT_TENANTNAME: "{{ swift_odoo_tenantname }}"
SWIFT_TENANTID: "{{ swift_odoo_tenantid }}"
SWIFT_REGIONNAME: "{{ swift_odoo_regionname }}"
- JOB_200_WHAT: "pg_dump --no-owner --format c --file $$SRC/$$PGDATABASE.pgdump"
- JOB_300_WHAT: "backup --full-if-older-than 6D --allow-source-mismatch"
+ JOB_200_WHEN: "never"
+ JOB_300_WHAT: "pg_dump --no-owner --format c --file $$SRC/$$PGDATABASE.pgdump && backup --full-if-older-than 6D --allow-source-mismatch"
JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@"
JOB_302_WHEN: "daily"
OPTIONS: "--allow-source-mismatch"
diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2
index 0ce0ce5..d9ff2fd 100644
--- a/templates/backup2.yaml.j2
+++ b/templates/backup2.yaml.j2
@@ -17,8 +17,8 @@ services:
SWIFT_TENANTNAME: "{{ swift_odoo2_tenantname }}"
SWIFT_TENANTID: "{{ swift_odoo2_tenantid }}"
SWIFT_REGIONNAME: "{{ swift_odoo2_regionname }}"
- JOB_200_WHAT: "pg_dump --no-owner --format c --file $$SRC/$$PGDATABASE.pgdump"
- JOB_300_WHAT: "backup --full-if-older-than 6D --allow-source-mismatch"
+ JOB_200_WHEN: "never"
+ JOB_300_WHAT: "pg_dump --no-owner --format c --file $$SRC/$$PGDATABASE.pgdump && backup --full-if-older-than 6D --allow-source-mismatch"
JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@"
JOB_302_WHEN: "daily"
OPTIONS: "--allow-source-mismatch"
--
GitLab