diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2 index 5c2294113f00f29858ddc619b25fa6a5da30e1be..b5a8fc2b8563b64010e10c31535fbe6c7b3ca6c4 100644 --- a/templates/backup.yaml.j2 +++ b/templates/backup.yaml.j2 @@ -1,7 +1,8 @@ version: "2.1" services: backup_etherpad: - image: tecnativa/duplicity:postgres + image: remifilament/duplicity:postgres # Until https://github.com/Tecnativa/docker-duplicity/pull/324 is merged + # image: ghcr.io/tecnativa/docker-duplicity-postgres:master # Once https://github.com/Tecnativa/docker-duplicity/pull/324 is merged hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-etherpad environment: DST: "swift://etherpad_{{ inventory_hostname|lower }}" @@ -16,10 +17,10 @@ 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_200_WHEN: "never" + JOB_300_WHAT: "pg_dump --no-owner --no-privileges --file $$SRC/$$PGDATABASE.sql && 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" networks: - etherpad_default - public diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2 index 693698a8f407d3af4696fdbbbc8ab866e089f2ef..edc95e07d012e89a8d7fc341375a01242654e35d 100644 --- a/templates/backup2.yaml.j2 +++ b/templates/backup2.yaml.j2 @@ -1,7 +1,8 @@ version: "2.1" services: backup_etherpad: - image: tecnativa/duplicity:postgres + image: remifilament/duplicity:postgres # Until https://github.com/Tecnativa/docker-duplicity/pull/324 is merged + # image: ghcr.io/tecnativa/docker-duplicity-postgres:master # Once https://github.com/Tecnativa/docker-duplicity/pull/324 is merged hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-etherpad environment: DST: "swift://etherpad_{{ inventory_hostname|lower }}" @@ -16,10 +17,10 @@ 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_200_WHEN: "never" + JOB_300_WHAT: "pg_dump --no-owner --no-privileges --file $$SRC/$$PGDATABASE.sql && 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" networks: - etherpad_default - public