X-Git-Url: https://git.sven.stormbind.net/?a=blobdiff_plain;f=hetzner%2Fhetznerbackupv2.sh;h=2ceb473d2e88c89cf28d57691db6030a5a63db58;hb=488bf506a4decb4e313c9d027cfcab23049474e7;hp=570ace5f51b061bcb8cf92f21d1929ad815a21bf;hpb=771c3ab297575afb75b6682fb3c071a03007c486;p=sven%2Fscripts.git

diff --git a/hetzner/hetznerbackupv2.sh b/hetzner/hetznerbackupv2.sh
index 570ace5..2ceb473 100755
--- a/hetzner/hetznerbackupv2.sh
+++ b/hetzner/hetznerbackupv2.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-### Halt on errors
-#set -e
-### Halt on unset variables
-set -u
-
 ### Do not inherit the following variables
 # Safety net just in case some calls this
 # script in a bogus way.
@@ -21,33 +16,34 @@ FTP_USER=uxxx
 FTP_HOST=uxxx.your-backup.de
 PROTO=ssh
 ROOTMAIL="root@localhost"
-LOCKFILE="/var/lock/backup/hetznerbackup"
+LOCKDIR="/var/lock/backup"
+LOCKFILE="$LOCKDIR/hetznerbackup"
 LOGFILE="/var/log/hetznerbackup"
 SESSIONLOG=$(mktemp /var/tmp/hetznerbackup.XXXXXXXXX)
 ERRSTAT=0
 
 ## Backup job for main
 job_main() {
-    echo "" >> $SESSIONLOG
-    echo "Backing up main `date`" >>
-    echo "" >> $SESSIONLOG
-
     echo "Going for /etc" >> $SESSIONLOG
     duplicity $BMODE $dry /etc $PROTO://$FTP_USER@$FTP_HOST/main/etc >> $SESSIONLOG 2>&1 || ERRSTAT=1
     duplicity remove-all-but-n-full 5 --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/etc >> $SESSIONLOG 2>&1 || ERRSTAT=1
+    duplicity cleanup --extra-clean --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/etc >> $SESSIONLOG 2>&1 || ERRSTAT=1
 
     echo "Going for /home" >> $SESSIONLOG
     duplicity $BMODE $dry /home $PROTO://$FTP_USER@$FTP_HOST/main/home >> $SESSIONLOG 2>&1  || ERRSTAT=1
     duplicity remove-all-but-n-full 5 --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/home >> $SESSIONLOG 2>&1 || ERRSTAT=1 
+    duplicity cleanup --extra-clean --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/home >> $SESSIONLOG 2>&1 || ERRSTAT=1
 
     echo "Going for /var/www" >> $SESSIONLOG
     duplicity $BMODE $dry /var/www $PROTO://$FTP_USER@$FTP_HOST/main/var/www >> $SESSIONLOG 2>&1  || ERRSTAT=1
     duplicity remove-all-but-n-full 5 --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/var/www >> $SESSIONLOG 2>&1  || ERRSTAT=1
+    duplicity cleanup --extra-clean --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/var/www >> $SESSIONLOG 2>&1 || ERRSTAT=1
 
     echo "Going for /var/lib/automysqlbackup" >> $SESSIONLOG
     if [ -e /var/lib/automysqlbackup/backupdone ]; then
 	    duplicity $BMODE $dry /var/lib/automysqlbackup $PROTO://$FTP_USER@$FTP_HOST/main/automysqlbackup >> $SESSIONLOG 2>&1  || ERRSTAT=1
 	    duplicity remove-all-but-n-full 5 --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/automysqlbackup >> $SESSIONLOG 2>&1  || ERRSTAT=1
+	    duplicity cleanup --extra-clean --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/automysqlbackup >> $SESSIONLOG 2>&1 || ERRSTAT=1
     else
        echo "WARNING: It seems that the last mysql backup is still runing" >> $SESSIONLOG
        echo "Skipping mysql backup - please re-schedule" >> $SESSIONLOG
@@ -56,7 +52,7 @@ job_main() {
     echo "" >> $SESSIONLOG
 }
 
-# Append the session log to the main logfile and remove it
+## Append the session log to the main logfile and remove it
 clean_log() {
    cat $SESSIONLOG >> $LOGFILE
    rm $SESSIONLOG
@@ -68,15 +64,23 @@ if [ -e $LOCKFILE ]; then
     echo "This is a typical result of a failed backup run, please contact your admin"
     exit 5
 else
+    if [ ! -d $LOCKDIR ]; then
+	mkdir -m 700 $LOCKDIR
+    fi
     touch $LOCKFILE
 fi
 
+### Starting
+    echo "" >> $SESSIONLOG
+    echo "Starting Backup `date`" >> $SESSIONLOG
+    echo "" >> $SESSIONLOG
+
 ### Set the duplicity backup mode we would like to use
 if [[ $(LANG=C; date +%A) =~ Sunday ]]; then
-    echo "Runing in full mode"
+    echo "Runing in full mode" >> $SESSIONLOG
     BMODE="full"
 else
-    echo "Runing in incr mode"
+    echo "Runing in incr mode" >> $SESSIONLOG
     BMODE="incr"
 fi