X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fscripts.git;a=blobdiff_plain;f=hetzner%2Fhetznerbackupv2.sh;h=0ffc0eccfd47935fd13b5d7b079147fd06464c8e;hp=294d4cffab4cd2b5c12d04bc6eab14ab73722307;hb=934060e0ca4f05c538dbe7e8856d5e0833d57be4;hpb=91552889ee8657d2f661100871f85468e08760bb

diff --git a/hetzner/hetznerbackupv2.sh b/hetzner/hetznerbackupv2.sh
index 294d4cf..0ffc0ec 100755
--- a/hetzner/hetznerbackupv2.sh
+++ b/hetzner/hetznerbackupv2.sh
@@ -16,8 +16,9 @@ FTP_USER=uxxx
 FTP_HOST=uxxx.your-backup.de
 PROTO=ssh
 ROOTMAIL="root@localhost"
-LOCKFILE="/var/lock/backup/hetznerbackup"
-LOGFILE="/var/log/hetznerbackup"
+LOCKDIR="/var/lock/backup"
+LOCKFILE="$LOCKDIR/hetznerbackup"
+LOGFILE="/var/log/hetznerbackup.log"
 SESSIONLOG=$(mktemp /var/tmp/hetznerbackup.XXXXXXXXX)
 ERRSTAT=0
 
@@ -30,31 +31,48 @@ job_main() {
     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 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/tomcat6" >> $SESSIONLOG
+    duplicity $BMODE $dry /var/lib/tomcat6 $PROTO://$FTP_USER@$FTP_HOST/main/tomcat6 >> $SESSIONLOG 2>&1  || ERRSTAT=1
+    duplicity remove-all-but-n-full 5 --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/tomcat6 >> $SESSIONLOG 2>&1  || ERRSTAT=1
+    duplicity cleanup --extra-clean --force $dry $PROTO://$FTP_USER@$FTP_HOST/main/tomcat6 >> $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
+       ERSSTAT=10
     fi
 
     echo "" >> $SESSIONLOG
 }
 
-# Append the session log to the main logfile and remove it
-clean_log() {
+# Append the session log to the main logfile and remove log and lock
+cleanup() {
+    ENDDATE=$(date)
+    if [ $ERRSTAT -eq 0 ]; then
+	echo "Backup finished successfully $ENDDATE" >> $SESSIONLOG
+    else
+	echo "ERROR Backup FAILED $ENDDATE" >> $SESSIONLOG
+	cat $SESSIONLOG|mail -s "ERROR Backup FAILED $ENDDATE with ERRCODE $ERRSTAT" $ROOTMAIL
+    fi
    cat $SESSIONLOG >> $LOGFILE
-   rm $SESSIONLOG
+   rm $SESSIONLOG $LOCKFILE
 }
 
 ### check for other runing instances of this script
@@ -63,31 +81,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
 
 ### 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
 
 ### Start the backup jobs
 job_main
-
 ### Cleanup and reporting
-ENDDATE=$(date)
-if [ $ERRSTAT -eq 0 ]; then
-    echo "Backup finished successfully $ENDDATE" >> $SESSIONLOG
-    clean_log
-    rm $LOCKFILE
-    exit 0
-else
-    echo "ERROR Backup FAILED $ENDDATE" >> $SESSIONLOG
-    cat $SESSIONLOG|mail -s "ERROR Backup FAILED $ENDDATE" $ROOTMAIL
-    clean_log
-    exit 1
-fi
+cleanup
+exit $ERRSTAT