diff --git a/templates/backup.sh.j2 b/templates/backup.sh.j2 index 36c1964e22b0d55b703435afeb49845afd81c41b..91a3575d2e60d97f2a44436c2c6cee1a1938d197 100644 --- a/templates/backup.sh.j2 +++ b/templates/backup.sh.j2 @@ -5,8 +5,6 @@ export PGHOST=localhost export PGPASSWORD={{ cloud_pg_pass }} export PGUSER={{ cloud_pg_user }} -pg_dump --no-owner --no-privileges --file "/root/backup-$PGDATABASE.sql" - export SWIFT_USERNAME="{{ swift_cloud_username }}" export SWIFT_PASSWORD="{{ swift_cloud_password }}" export SWIFT_AUTHURL="{{ swift_cloud_authurl }}" @@ -17,6 +15,7 @@ export SWIFT_REGIONNAME="{{ swift_cloud_regionname }}" export PASSPHRASE="{{ cloud_backup_pass }}" -duplicity full --volsize 200 --include /var/www/owncloud/data --include /var/www/owncloud/config --include /root/backup-$PGDATABASE.sql --exclude '**' / swift://owncloud_{{ inventory_hostname|lower }} +pg_dump --no-owner --no-privileges --file "/root/backup-$PGDATABASE.sql" &&\ + duplicity full --volsize 200 --include /var/www/owncloud/data --include /var/www/owncloud/config --include /root/backup-$PGDATABASE.sql --exclude '**' / swift://owncloud_{{ inventory_hostname|lower }} &&\ + rm /root/backup-$PGDATABASE.sql duplicity remove-all-but-n-full 5 --force swift://owncloud_{{ inventory_hostname|lower }} -rm /root/backup-$PGDATABASE.sql