[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sysadmin/kde-ansible] roles/kde-backup/templates: Update silk backup script
From:       Nicolás_Alvarez <null () kde ! org>
Date:       2018-05-27 19:00:40
Message-ID: E1fN0uG-000599-W9 () code ! kde ! org
[Download RAW message or body]

Git commit 6efca6e74ee5c336ab6b5145eec1bca72bfba35e by Nicolás Alvarez.
Committed on 27/05/2018 at 05:30.
Pushed by nalvarez into branch 'master'.

Update silk backup script

Remove redundant tarball-based backups now that we're using borg.

(This change was done a while ago, but not applied in ansible)

M  +1    -7    roles/kde-backup/templates/backup-silk.sh

https://commits.kde.org/sysadmin/kde-ansible/6efca6e74ee5c336ab6b5145eec1bca72bfba35e

diff --git a/roles/kde-backup/templates/backup-silk.sh \
b/roles/kde-backup/templates/backup-silk.sh index 91bf804..e90d1a1 100755
--- a/roles/kde-backup/templates/backup-silk.sh
+++ b/roles/kde-backup/templates/backup-silk.sh
@@ -12,12 +12,6 @@ DATABASE="stats"
 mysqldump --opt --quick --single-transaction --skip-extended-insert  --events \
--create-options --set-charset  $DATABASE > $LOCATION/db.$DATABASE.sql  xz -f \
$LOCATION/db.$DATABASE.sql  
-# Backup homes!
-tar -cJf /root/backups/homes.`date +%w`.tar.xz -C / home/
-
-# Backup website contents
-tar -cJf $LOCATION/srv.`date +%w`.tar.xz -C / --exclude=srv/www/forum.kde.org/cache \
--exclude=srv/www/mediawiki/mediawiki/cache \
--exclude=srv/www/mediawiki/mediawiki/logs \
--exclude=srv/www/paste.kde.org/app/storage --exclude=*/.git srv/www 2>&1 | grep -v \
                "file changed as we read it"
-
 # Backup configuration and list of installed packages
 tar -czf $LOCATION/etc.`date +%w`.tgz -C / etc/
 tar -czf $LOCATION/crontabs.`date +%w`.tgz -C / var/spool/cron/
@@ -35,7 +29,7 @@ BORG_SERVER="ssh://{{backup_creds.username}}@{{backup_creds.username}}.your-back
  
 # Backup /srv
 export BORG_REPO="$BORG_SERVER/./borg-backups/silk-srv"
-borg create --compression zlib,5 --exclude-caches ::'{hostname}-silk-srv-{now}' \
/srv/ 2>&1 | grep -v "Compacting segments" +borg create --compression zlib,5 \
--exclude-caches --exclude /srv/www/paste.kde.org/app/storage/sessions/ \
::'{hostname}-silk-srv-{now}' /srv/ 2>&1 | grep -v "Compacting segments"  borg prune \
--prefix '{hostname}-' --keep-daily 7 --keep-weekly 4 --keep-monthly 6 2>&1 | grep -v \
"Compacting segments"  
 # Backup /home


[prev in list] [next in list] [prev in thread] [next in thread]