Changeset 52 for scripts

Timestamp:

Jun 9, 2014, 11:58:45 AM (10 years ago)

Author:

alloc

Message:

Version 14: Fixes #12

Location:

scripts

Files:

• etc/7dtd.conf (modified) (1 diff)
• usr/local/lib/7dtd/VERSION (modified) (1 diff)
• usr/local/lib/7dtd/commands/backup.sh (modified) (3 diffs)

scripts/etc/7dtd.conf

@@ -8 +8 @@
 export SDTD_BASE=/home/sdtd
 
-# Root directory for backups
+# Backup options
 export SDTD_BACKUP_ROOT=/home/sdtd/backup
+export SDTD_BACKUP_MIN_BACKUPS_KEEP=
+export SDTD_BACKUP_MAX_BACKUPS=
+export SDTD_BACKUP_MAX_STORAGE=
+export SDTD_BACKUP_MAX_AGE=
+export SDTD_BACKUP_COMPRESS=none
 
 # User account and group to run the server

scripts/usr/local/lib/7dtd/VERSION

@@ -1 @@
-Version: 13
-Release: 2014-06-05
+Version: 14
+Release: 2014-06-09

scripts/usr/local/lib/7dtd/commands/backup.sh

@@ -4 +4 @@
 
 sdtdCommandBackup() {
-        DT=`date "+%Y-%m-%d_%H-%M"`
-        NewBackup=$SDTD_BACKUP_ROOT/$DT
+        local DT=`date "+%Y-%m-%d_%H-%M"`
+        local NewBackup=$SDTD_BACKUP_ROOT/$DT
 
         # Check for backup folder existence
@@ -11 +11 @@
                 # Exists, copy(link) latest backup
                 unset -v LatestBackup
-                for file in "$SDTD_BACKUP_ROOT"/*; do
-                        [[ $file -nt $LatestBackup ]] && LatestBackup=$file
+                local fileI
+                for fileI in "$SDTD_BACKUP_ROOT"/*; do
+                        if [ $fileI -nt $LatestBackup -a -d $fileI ]; then
+                                LatestBackup=$fileI
+                        fi
                 done
-                cp -al $LatestBackup $NewBackup
-        else
+                if [ -d $LatestBackup ]; then
+                        cp -al $LatestBackup $NewBackup
+                fi
+        fi
+        
+        if [ ! -d $SDTD_BACKUP_ROOT ]; then
                 # Create new backup dir
                 mkdir $SDTD_BACKUP_ROOT
@@ -22 +29 @@
         $RSYNC -a --delete --numeric-ids --delete-excluded $SDTD_BASE/instances/./ $NewBackup
         touch $NewBackup
+        
+        ## Compress if enabled
+        case ${SDTD_BACKUP_COMPRESS:-none} in
+                all)
+                        local dfname=$(basename $NewBackup)
+                        cd $SDTD_BACKUP_ROOT
+                        tar -czf $dfname.tar.gz $dfname
+                        touch -r $dfname $dfname.tar.gz
+                        rm -Rf $dfname
+                        ;;
+                old)
+                        if [ -d $LatestBackup ]; then
+                                local dfname=$(basename $LatestBackup)
+                                cd $SDTD_BACKUP_ROOT
+                                tar -czf $dfname.tar.gz $dfname
+                                touch -r $dfname $dfname.tar.gz
+                                rm -Rf $dfname
+                        fi
+                        ;;
+                none)
+                        ;;
+        esac
+        
+        ## Purge old/too many backups
+        local keepMin=${SDTD_BACKUP_MIN_BACKUPS_KEEP:-0}
+        if [ $(isANumber $SDTD_BACKUP_MAX_BACKUPS) -eq 1 ]; then
+                local removeBut=$SDTD_BACKUP_MAX_BACKUPS
+                if [ $SDTD_BACKUP_MAX_BACKUPS -lt $keepMin ]; then
+                        removeBut=$keepMin
+                fi
+                local num=0
+                local F
+                for F in $(ls -t1 $SDTD_BACKUP_ROOT); do
+                        (( num++ ))
+                        if [ $num -gt $removeBut ]; then
+                                rm $F
+                        fi
+                done
+        fi
+        if [ $(isANumber $SDTD_BACKUP_MAX_AGE) -eq 1 ]; then
+                local FINDBASE="find $SDTD_BACKUP_ROOT -mindepth 1 -maxdepth 1"
+                # Only continue if there are more than MIN_BACKUPS_KEEP backups at all
+                if [ $($FINDBASE | wc -l) -gt $keepMin ]; then
+                        local minutes=$(( $SDTD_BACKUP_MAX_AGE*60 ))
+                        while [ $($FINDBASE -mmin -$minutes | wc -l) -lt $keepMin ]; do
+                                minutes=$(( minutes+60 ))
+                        done
+                        $FINDBASE -mmin +$minutes -exec rm -Rf {} \;
+                fi
+        fi
+        if [ $(isANumber $SDTD_BACKUP_MAX_STORAGE) -eq 1 ]; then
+                local maxKBytes=$(( $SDTD_BACKUP_MAX_STORAGE*1024 ))
+                local curNumFiles=$(ls -t1 $SDTD_BACKUP_ROOT | wc -l)
+                while [ $(du -sk $SDTD_BACKUP_ROOT) -gt $maxKBytes -a $curNumFiles -gt $keepMin ]; do
+                        local toDel=$(ls -tr1 | head -n 1)
+                        rm -Rf $toDel
+                        (( curNumFiles-- ))
+                done
+        fi
 
         for H in $(getHooksFor backup); do
                 $H $NewBackup
         done
-
-        #echo "Backup folder disk usage: `$DU -sh $SDTD_BACKUP_ROOT`"
 }