From f0065cdd4b87a3605a3ace287759141d06bacbdd 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:05:55 +0200 Subject: [PATCH] [DEL] remove allow-source-mismatch --- templates/backup.yaml.j2 | 3 +-- templates/backup2.yaml.j2 | 3 +-- templates/restore-odootest.yaml.j2 | 2 +- templates/restore2-odootest.yaml.j2 | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2 index 4a6b01e..b55b5cf 100644 --- a/templates/backup.yaml.j2 +++ b/templates/backup.yaml.j2 @@ -18,10 +18,9 @@ services: SWIFT_TENANTID: "{{ swift_odoo_tenantid }}" SWIFT_REGIONNAME: "{{ swift_odoo_regionname }}" 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_300_WHAT: "pg_dump --no-owner --format c --file $$SRC/$$PGDATABASE.pgdump && backup --full-if-older-than 6D" JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@" JOB_302_WHEN: "daily" - OPTIONS: "--allow-source-mismatch" volumes: - odoo_backup_cache:/root/.cache/duplicity/:z - odoo_filestore:/mnt/backup/src/odoo:z diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2 index d9ff2fd..12c9801 100644 --- a/templates/backup2.yaml.j2 +++ b/templates/backup2.yaml.j2 @@ -18,10 +18,9 @@ services: SWIFT_TENANTID: "{{ swift_odoo2_tenantid }}" SWIFT_REGIONNAME: "{{ swift_odoo2_regionname }}" 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_300_WHAT: "pg_dump --no-owner --format c --file $$SRC/$$PGDATABASE.pgdump && backup --full-if-older-than 6D" JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@" JOB_302_WHEN: "daily" - OPTIONS: "--allow-source-mismatch" volumes: - odoo_backup2_cache:/root/.cache/duplicity/:z - odoo_filestore:/mnt/backup/src/odoo:z diff --git a/templates/restore-odootest.yaml.j2 b/templates/restore-odootest.yaml.j2 index c71f591..d2bdb51 100644 --- a/templates/restore-odootest.yaml.j2 +++ b/templates/restore-odootest.yaml.j2 @@ -21,7 +21,7 @@ services: SWIFT_TENANTNAME: "{{ swift_odoo_tenantname }}" SWIFT_TENANTID: "{{ swift_odoo_tenantid }}" SWIFT_REGIONNAME: "{{ swift_odoo_regionname }}" - OPTIONS: "--force --allow-source-mismatch" + OPTIONS: "--force" {% if odoo_prod is defined %} DST: "swift://odoo_{{ inventory_hostname|lower }}" PGUSER: "{{ odoo_prod.db_user }}" diff --git a/templates/restore2-odootest.yaml.j2 b/templates/restore2-odootest.yaml.j2 index a333df3..fc64645 100644 --- a/templates/restore2-odootest.yaml.j2 +++ b/templates/restore2-odootest.yaml.j2 @@ -21,7 +21,7 @@ services: SWIFT_TENANTNAME: "{{ swift_odoo2_tenantname }}" SWIFT_TENANTID: "{{ swift_odoo2_tenantid }}" SWIFT_REGIONNAME: "{{ swift_odoo2_regionname }}" - OPTIONS: "--force --allow-source-mismatch" + OPTIONS: "--force" {% if odoo_prod is defined %} DST: "swift://odoo_{{ inventory_hostname|lower }}" PGUSER: "{{ odoo_prod.db_user }}" -- GitLab