diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2 index 4a6b01efe40beb6daf453e9a2589d2872cd7447d..b55b5cfe3b410fb6cf11341369694e5fa057dbcc 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 d9ff2fdf1af5d8504f0c1a844f005a56aa191e7d..12c98012eea6dd4c31235b540f7c1f980e25654c 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 c71f59108e89bb6e41ece8a98ed05ad64bb1b065..d2bdb51b22b36128f02e59653811ed92b612c53d 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 a333df38395b8b50879b1190ec3b503c2131aa8a..fc6464586c5bccda3e277e3f87c2df11d5a64687 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 }}"