From 36a9d9e92ee8217458f1c8d5a2318615eca8541f 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 10:09:23 +0200
Subject: [PATCH] [ENH] get db dump and backup in same command
---
templates/backup.sh.j2 | 8 +++-----
templates/backup2.sh.j2 | 7 +++----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/templates/backup.sh.j2 b/templates/backup.sh.j2
index 42b0ff8..495b12a 100644
--- a/templates/backup.sh.j2
+++ b/templates/backup.sh.j2
@@ -1,8 +1,4 @@
#!/bin/bash
-
-cd /tmp/
-su -c 'pg_dump {{ odoo_db }} --no-owner --no-privileges --format c --file "/tmp/backup-$PGDATABASE.pgdump"' -s /bin/sh {{ odoo_user }}
-
export SWIFT_USERNAME="{{ swift_odoo_username }}"
export SWIFT_PASSWORD="{{ swift_odoo_password }}"
export SWIFT_AUTHURL="{{ swift_odoo_authurl }}"
@@ -13,5 +9,7 @@ export SWIFT_REGIONNAME="{{ swift_odoo_regionname }}"
export PASSPHRASE="{{ odoo_backup_pass }}"
-duplicity --name backup --full-if-older-than 6D --volsize 200 --include /home/odoo/.local/share/Odoo/filestore/ --include /tmp/backup-$PGDATABASE.pgdump --exclude '**' / swift://odoo_{{ inventory_hostname|lower }}
+cd /tmp/ &&\
+ su -c 'pg_dump {{ odoo_db }} --no-owner --no-privileges --format c --file "/tmp/backup-$PGDATABASE.pgdump"' -s /bin/sh {{ odoo_user }} &&\
+ duplicity --name backup --full-if-older-than 6D --volsize 200 --include /home/odoo/.local/share/Odoo/filestore/ --include /tmp/backup-$PGDATABASE.pgdump --exclude '**' / swift://odoo_{{ inventory_hostname|lower }}
duplicity remove-all-but-n-full 5 --force swift://odoo_{{ inventory_hostname|lower }}
diff --git a/templates/backup2.sh.j2 b/templates/backup2.sh.j2
index bc23f12..7030530 100644
--- a/templates/backup2.sh.j2
+++ b/templates/backup2.sh.j2
@@ -1,8 +1,5 @@
#!/bin/bash
-cd /tmp/
-su -c 'pg_dump {{ odoo_db }} --no-owner --no-privileges --format c --file "/tmp/backup-$PGDATABASE.pgdump"' -s /bin/sh {{ odoo_user }}
-
export SWIFT_USERNAME="{{ swift_odoo2_username }}"
export SWIFT_PASSWORD="{{ swift_odoo2_password }}"
export SWIFT_AUTHURL="{{ swift_odoo2_authurl }}"
@@ -13,5 +10,7 @@ export SWIFT_REGIONNAME="{{ swift_odoo2_regionname }}"
export PASSPHRASE="{{ odoo_backup_pass }}"
-duplicity --name backup2 --full-if-older-than 6D --volsize 200 --include /home/odoo/.local/share/Odoo/filestore/ --include /tmp/backup-$PGDATABASE.pgdump --exclude '**' / swift://odoo_{{ inventory_hostname|lower }}
+cd /tmp/ &&\
+ su -c 'pg_dump {{ odoo_db }} --no-owner --no-privileges --format c --file "/tmp/backup-$PGDATABASE.pgdump"' -s /bin/sh {{ odoo_user }} &&\
+ duplicity --name backup2 --full-if-older-than 6D --volsize 200 --include /home/odoo/.local/share/Odoo/filestore/ --include /tmp/backup-$PGDATABASE.pgdump --exclude '**' / swift://odoo_{{ inventory_hostname|lower }}
duplicity remove-all-but-n-full 5 --force swift://odoo_{{ inventory_hostname|lower }}
--
GitLab