Git commit 08a3229f746308033abb2f2944c55baa3140eb4e by Ben Cooksley.
Committed on 30/06/2018 at 23:57.
Pushed by bcooksley into branch 'master'.

Sync changes from Code

M  +10   -6    roles/kde-backup/templates/backup-code.sh

https://commits.kde.org/sysadmin/kde-ansible/08a3229f746308033abb2f2944c55b=
aa3140eb4e

diff --git a/roles/kde-backup/templates/backup-code.sh b/roles/kde-backup/t=
emplates/backup-code.sh
index 019fc17..99aea3c 100755
--- a/roles/kde-backup/templates/backup-code.sh
+++ b/roles/kde-backup/templates/backup-code.sh
@@ -15,12 +15,6 @@ tar -cJf $LOCATION/sysadmin-repo.`date +%w`.tar.xz -C / =
srv/sysadmin/
 tar -cJf $LOCATION/gitolite-admin-main.`date +%w`.tar.xz -C / srv/git/repo=
sitories/gitolite-admin.git/
 tar -cJf $LOCATION/gitolite-admin-neon.`date +%w`.tar.xz -C / srv/neon/git=
olite-admin.git/
 =

-# Backup home directories, as additional insurance that we have all the sc=
ripts we need
-tar -cJf $LOCATION/homes.`date +%w`.tar.xz -C / home/ 2>&1 | grep -v "file=
 changed as we read it"
-
-# Backup Phabricator's databases
-su -l phabricator -c "cd /srv/phabricator/phabricator && ./bin/storage dum=
p --no-indexes | bzip2" > $LOCATION/phabricator-database.`date +%w`.sql.bz2
-
 # Grab the system config, package listing and cronjobs
 tar -czf $LOCATION/crontabs.`date +%w`.tgz -C / var/spool/cron/
 tar -czf $LOCATION/etc.`date +%w`.tgz -C / etc/
@@ -39,6 +33,16 @@ export BORG_PASSPHRASE=3D'{{backup_borg_passphrase}}'
 {% set backup_creds =3D hetzner_backup_creds[hetzner_backup_host] %}
 BORG_SERVER=3D"ssh://{{backup_creds.username}}@{{backup_creds.username}}.y=
our-backup.de:23"
 =

+# Backup Homes
+export BORG_REPO=3D"$BORG_SERVER/./borg-backups/code-homes"
+borg create --compression zlib,5 --exclude-caches ::'{hostname}-phabricato=
r-{now}' /home/ 2>&1 | grep -v "Compacting segments"
+borg prune --prefix '{hostname}-' --keep-daily 7 --keep-weekly 4 --keep-mo=
nthly 6 2>&1 | grep -v "Compacting segments"
+
+# Backup Databases
+export BORG_REPO=3D"$BORG_SERVER/./borg-backups/db-backups"
+su -l phabricator -c "cd /srv/phabricator/phabricator && ./bin/storage dum=
p --no-indexes" | borg create --compression lzma,3 ::'{hostname}-db-backups=
-{now}' - 2>&1 | grep -v "Compacting segments"
+borg prune --prefix '{hostname}-' --keep-daily 7 --keep-weekly 4 --keep-mo=
nthly 6 2>&1 | grep -v "Compacting segments"
+
 # Backup Phabricator
 export BORG_REPO=3D"$BORG_SERVER/./borg-backups/phabricator"
 borg create --compression zlib,5 --exclude-caches --exclude /srv/phabricat=
or/logs/ --exclude /srv/phabricator/repos/ ::'{hostname}-phabricator-{now}'=
 /srv/phabricator/ 2>&1 | grep -v "Compacting segments"