Changeset 595c2eb for npl


Ignore:
Timestamp:
03/27/17 16:23:26 (8 years ago)
Author:
Edwin Eefting <edwin@datux.nl>
Branches:
master, perl-5.22
Children:
f651f1e
Parents:
577e6d3
Message:

better handling of BACKUP_CONF

Location:
npl/syn3/backup
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • npl/syn3/backup/backup

    r577e6d3 r595c2eb  
    11#!/bin/bash
    2 #Backup script for Syn3 (C)DatuX 
     2#Backup script for Syn3 (C)DatuX
    33
    44name='backup'
    5 source /etc/backup.conf || exit 1
    6 source $SCRIPTDIR/backuplib || exit 1
    7 
    8 #load additional backup config file?
    9 if [ -e "$BACKUP_CONF" ]; then
    10         source $BACKUP_CONF || exit 1
    11 fi
     5source /usr/backup/backuplib || exit 1
    126
    137
    … …  
    2115                #nope, so exit cleanly
    2216                exit 0
    23         fi     
     17        fi
    2418fi
    2519
    … …  
    6660        echo "INFO:Backup session ended"
    6761        exit $1
    68 }       
    69 
    70 
    71        
     62}
     63
     64
     65
    7266echo "INFO: Backup session started at `date`"
    7367if [ "$1" == "now" ]; then
    … …  
    9791        ROOTFS=$SNAPMNT
    9892    fi
    99    
     93
    10094    #rsync the root+boot filesystem data
    10195    echo "INFO: Collecting / and /boot ..."
    102     rsync -ax -q --ignore-errors --numeric-ids --delete --exclude=/tmp/* --exclude=/dev/.udev /boot $ROOTFS/. "$BACKUPMNT/.syn3systembackup" 
     96    rsync -ax -q --ignore-errors --numeric-ids --delete --exclude=/tmp/* --exclude=/dev/.udev /boot $ROOTFS/. "$BACKUPMNT/.syn3systembackup"
    10397    err=$?
    10498    #ignore some errors (partial transfers, vanishing files)
    … …  
    128122    #note: on redundant systems /dev/home points to /dev/drbd.. instead of /dev/syn3/home, so this is why we need this extra variable:
    129123    Snapshot $SNAPSOURCEDEV || terminated
    130    
     124
    131125    #unfreeze the databases
    132126    unfreeze
    133        
     127
    134128    echo "INFO: Checking snapshots."
    135129    if ! SnapshotValid; then
    … …  
    152146        fi
    153147    done
    154     sync 
     148    sync
    155149    #dump the normal location.
    156150    DUMPMNT=$BACKUPMNT
    … …  
    174168        while true; do
    175169                if [ $mode == "smb" ]; then
    176                         xfsdump -e -o -p 10 -F - $resumeflag $OPTS $DUMPMNT | gzip --fast | smbclient --timeout 3600 -s /dev/null -c "put - $FILE" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd" 
     170                        xfsdump -e -o -p 10 -F - $resumeflag $OPTS $DUMPMNT | gzip --fast | smbclient --timeout 3600 -s /dev/null -c "put - $FILE" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd"
    177171                        #also check xfsdump exit code to prevent samba exit-code bug: https://bugzilla.samba.org/show_bug.cgi?id=7551
    178                         if [ "$?${PIPESTATUS[0]}" != "00" ]; then 
     172                        if [ "$?${PIPESTATUS[0]}" != "00" ]; then
    179173                                terminated
    180174                        fi
    181175                elif [ $mode == "tape" ]; then
    182                         xfsdump -e -L "$FILE" -o -p 10 -F -f $TAPEDEV $resumeflag $OPTS $DUMPMNT 
     176                        xfsdump -e -L "$FILE" -o -p 10 -F -f $TAPEDEV $resumeflag $OPTS $DUMPMNT
    183177                elif [ $mode == "usbtape" ]; then
    184                         xfsdump -e -L "$FILE" -o -b 65536 -p 10 -F -f $TAPEDEV $resumeflag $OPTS $DUMPMNT 
     178                        xfsdump -e -L "$FILE" -o -b 65536 -p 10 -F -f $TAPEDEV $resumeflag $OPTS $DUMPMNT
    185179                elif [ $mode == "rsync" ]; then
    186180                        export PASSWD="$rsyncpasswd"
    … …  
    198192                else
    199193                        echo "Backupmode $mode is unknown!";
    200                         terminated 
     194                        terminated
    201195                fi
    202196                if [ $? == 0 ]; then
    … …  
    229223                fi
    230224        done
    231 ) 2>&1 | 
     225) 2>&1 |
    232226#analyse the output of the above block
    233 while read LINE; do 
     227while read LINE; do
    234228        ProcXfsOutput "$LINE" || terminated
    235 done 
     229done
    236230
    237231#did something go wrong?

  • npl/syn3/backup/backuplib

    r577e6d3 r595c2eb  
    11#!/bin/bash
     2
     3source /etc/backup.conf || exit 1
     4
     5#load additional backup config file?
     6if [ -e "$BACKUP_CONF" ]; then
     7        source $BACKUP_CONF || exit 1
     8fi
     9
    210
    311#correct ssh command and parameters for rsync backups, to force passwords and disable pubkeyauthentication. (it seems wrong, but in this use-case it actually makes sense)

  • npl/syn3/backup/cleanup

    r577e6d3 r595c2eb  
    11#!/bin/bash
    2 #Backup script for Syn3 (C)DatuX
    3 source /etc/backup.conf || exit 1
    4 source $SCRIPTDIR/backuplib || exit 1
    5 
     2#Backup script for Syn3 (C)DatuX
     3source /usr/backup/backuplib || exit 1
    64#skip cleanup for tapes
    75if [ $mode == "tape" ]; then
    … …  
    3331
    3432echo "INFO:Checking for old backups that can be deleted.."
    35 for FILE in `$SCRIPTDIR/list`; do 
     33for FILE in `$SCRIPTDIR/list`; do
    3634        [ "$FILE" == "$SKIPFILE" ] && continue;
    3735
    … …  
    5351                        fi
    5452                fi
    55                
     53
    5654                #not in future?
    57                 if [ $STAMP -lt $NOW ]; then 
     55                if [ $STAMP -lt $NOW ]; then
    5856                        if [ $DEL == 1 ]; then
    59                                 echo "INFO:Deleting $FILE"     
     57                                echo "INFO:Deleting $FILE"
    6058                                $SCRIPTDIR/delete "$FILE" || exit 1
    6159                        fi

  • npl/syn3/backup/delete

    r577e6d3 r595c2eb  
    11#!/bin/bash
    2 #Backup script for Syn3 (C)DatuX
    3 source /etc/backup.conf || exit 1
    4 source $SCRIPTDIR/backuplib || exit 1
     2#Backup script for Syn3 (C)DatuX
     3source /usr/backup/backuplib || exit 1
    54
    65FILE=$1

  • npl/syn3/backup/list

    r577e6d3 r595c2eb  
    11#!/bin/bash
    2 #Backup script for Syn3 (C)DatuX
    3 source /etc/backup.conf || exit 1
    4 source $SCRIPTDIR/backuplib || exit 1
     2#Backup script for Syn3 (C)DatuX
     3source /usr/backup/backuplib || exit 1
    54cd /
    65
    … …  
    1615    /usr/backup/sshpass rsync $RSYNC_SETTINGS --rsh "$SSHCMD" -v -R -n --no-implied-dirs "$rsyncserver:$rsyncdir/syn3backupmeta/syn3_*" /tmp/backupmetadummy/ > /tmp/syn3backuplastest.$$;
    1716    RET_LATEST=$?
    18    
    19     /usr/backup/sshpass rsync $RSYNC_SETTINGS --rsh "$SSHCMD" -v -R -n --no-implied-dirs "$rsyncserver:$rsyncsnapdir/syn3backupmeta/syn3_*" /tmp/backupmetadummy/ > /tmp/syn3backupsnapshots.$$; 
     17
     18    /usr/backup/sshpass rsync $RSYNC_SETTINGS --rsh "$SSHCMD" -v -R -n --no-implied-dirs "$rsyncserver:$rsyncsnapdir/syn3backupmeta/syn3_*" /tmp/backupmetadummy/ > /tmp/syn3backupsnapshots.$$;
    2019    RET_SNAPSHOTS=$?
    21    
     20
    2221    #TODO: create a nice way to do error feedback (needs webint changes)
    2322
    … …  
    3029    [ "${rsyncdir:0:1}" == "/" ] && SLASH="/"
    3130    [ "$RET_LATEST" == "0" ] && grep syn3_ /tmp/syn3backuplastest.$$ | sed "s@^@$SLASH@"
    32    
     31
    3332    rm /tmp/syn3backuplastest.$$ /tmp/syn3backupsnapshots.$$
    3433    exit 0

  • npl/syn3/backup/listfiles

    r577e6d3 r595c2eb  
    11#!/bin/bash
    2 #Backup script for Syn3 (C)DatuX
    3 source /etc/backup.conf || exit 1
    4 source $SCRIPTDIR/backuplib || exit 1
     2#Backup script for Syn3 (C)DatuX
     3source /usr/backup/backuplib || exit 1
    54cd /
    65
    … …  
    1716                xfsrestore -p 10 -L "$FILE" -t -v 0 -f "$TAPEDEV" -F || exit 1;
    1817        elif [ $mode == "usbtape" ]; then
    19                 xfsrestore -p 10 -L "$FILE" -t -v 0 -f "$TAPEDEV" -F -b 65536  || exit 1; 
     18                xfsrestore -p 10 -L "$FILE" -t -v 0 -f "$TAPEDEV" -F -b 65536  || exit 1;
    2019        else
    2120                echo "Backupmode $mode is unknown!";
    … …  
    2423#Analyse the output of the above block
    2524#This will produce progress-information to filehandle 3 for the SCC to pickup.
    26     tee "$FILELISTCACHEDIR/tmp" | 
     25    tee "$FILELISTCACHEDIR/tmp" |
    2726    grep --line-buffered "^xfsrestore:" | #only use lines that are important for procxfsoutput (because its slow!)
    2827    while read LINE; do
    … …  
    3433#filter the xfsrestore status messages from our precious listfile :)
    3534grep -v "^xfsrestore:" "$FILELISTCACHEDIR/tmp" > "$FILELISTCACHEDIR/$FILE" || exit 1
    36 rm "$FILELISTCACHEDIR/tmp" 
     35rm "$FILELISTCACHEDIR/tmp"
    3736fi
    3837

  • npl/syn3/backup/restore

    r577e6d3 r595c2eb  
    11#!/bin/bash
    2 #Restore script for Syn-3 (C)DatuX
    3 source /etc/backup.conf || exit 1
    4 source $SCRIPTDIR/backuplib || exit 1
     2#Restore script for Syn-3 (C)DatuX
     3source /usr/backup/backuplib || exit 1
    54
    65FILE=$1
    … …  
    4140syn3-state backup ALERT "Disaster restore started. Your system is unusable until the restore has completed."
    4241
    43 ############################# 
     42#############################
    4443echo "STAT:Preparing $BACKUPDEV"
    4544
    … …  
    7978(
    8079        if [ $mode == "smb" ]; then
    81                 smbclient --timeout 3600 -s /dev/null --stderr -c "get $FILE -" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd" | gunzip | xfsrestore -o -p 10 -F - $BACKUPMNT || terminated 
     80                smbclient --timeout 3600 -s /dev/null --stderr -c "get $FILE -" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd" | gunzip | xfsrestore -o -p 10 -F - $BACKUPMNT || terminated
    8281                [ "${PIPESTATUS[0]}" != "0" ] && terminated "Error while reading from fileserver."
    8382                exit 0
    … …  
    9291        else
    9392                echo "Backupmode $mode is unknown!";
    94                 terminated 
     93                terminated
    9594        fi
    96 ) 2>&1 | 
     95) 2>&1 |
    9796#analyse the output of the above block
    98 while read LINE; do 
     97while read LINE; do
    9998        ProcXfsOutput "$LINE" || terminated
    100 done 
     99done
    101100
    102101#something went wrong?
    … …  
    109108#Look at: http://open.syn3.nl/syn3/trac/default/wiki/SynBackup for technical details.
    110109
    111 #we have a systembackup to restore? 
     110#we have a systembackup to restore?
    112111if [ -e $BACKUPMNT/.syn3systembackup ]; then
    113112        #touch this file so the initrd will format / and /boot and copy the data there.

  • npl/syn3/backup/restorefiles

    r577e6d3 r595c2eb  
    11#!/bin/bash
    2 #Backup script for Syn3 (C)DatuX
    3 source /etc/backup.conf || exit 1
    4 source $SCRIPTDIR/backuplib || exit 1
     2#Backup script for Syn3 (C)DatuX
     3source /usr/backup/backuplib || exit 1
    54
    65FILENAME=$1;
    … …  
    3029                smbclient --timeout 3600  -s /dev/null -c "get $FILENAME -" -U "$smbuser" -W "$smbdomain" "//$smbserver/$smbshare" "$smbpasswd"  |gunzip| eval xfsrestore -p 10 - -o -F $FILEPATHS "$DESTINATION" || exit 1;
    3130        elif [ $mode == "tape" ]; then
    32                 #echo xfsrestore -p 10 -L "$FILENAME" -o -F $FILEPATHS -f "$TAPEDEV" "$DESTINATION" 
     31                #echo xfsrestore -p 10 -L "$FILENAME" -o -F $FILEPATHS -f "$TAPEDEV" "$DESTINATION"
    3332                eval xfsrestore -p 10 -L "$FILENAME" -o -F $FILEPATHS -f "$TAPEDEV" "$DESTINATION" || exit 1;
    3433        elif [ $mode == "usbtape" ]; then
    … …  
    3736                echo "Backupmode $mode is unknown!";
    3837        fi
    39 ) 2>&1 | 
     38) 2>&1 |
    4039#analyse the output of the above block
    41 while read LINE; do 
     40while read LINE; do
    4241        ProcXfsOutput "$LINE" || exit 1
    4342done
    44 

  • npl/syn3/backup/syn3backup.build

    r577e6d3 r595c2eb  
    1 6548
     16550

  • npl/syn3/backup/syn3backup.md5

    r577e6d3 r595c2eb  
    1 ecf10c7e2ebe7c09da6bae104fb0b3ca  ./backup
     117d2ccbdcf7937a1ef1134ba7c4b0378  ./backup
    22779c5c089a832327ff56b7db1d89ea25  ./backup.conf
    3 609916f5b9856ac6c00229628e959bf0  ./backuplib
    4 00f891dd773d85750d8212f0ba02e246  ./cleanup
    5 3cdeb17172997c4ecc3c27fa187b0fa1  ./delete
    6 fadfc8742aed0b81297765b9e4350e3f  ./list
    7 137c782694746269699bb022b6b647e9  ./listfiles
     319499d91077241a779176b275081aa96  ./backuplib
     45fd22ce56460e9ab76641f1f322bd30f  ./cleanup
     5a65357fe969b583c6220300ae54316b4  ./delete
     6b97e0e1bf8be8787d71c763f8fd56550  ./list
     78964fa790326d3924faf0a3a0253fe56  ./listfiles
    882016cc75fdc0fc52998a1d2291395879  ./modules/mysql.backup
    99b07c8333373794830b95567130ffd821  ./modules/mysql.freeze
    … …  
    2222cc0682867de94c1ccb2163e2fb1856e8  ./post.backup
    23237158d3d4117bda9ee72ff6542bd141d7  ./post.restore
    24 5c6a3e0a4f34e7e9a30c534a4e3e44c5  ./restore
    25 a5c8f09a59ffb86f65344f20926f1b61  ./restorefiles
     24bd04ec4ba9f753e1b36ecaec9be394e2  ./restore
     25b42907f76531300850bad1104e2f6bdf  ./restorefiles
    2626478387d5e8c95cee3c270858e930b2ba  ./sshpass
    27 02c74cd009a095c929b0f182fe837990  ./syn3backup.pkg
     2716227d7d8c11b00394b292ebd0615612  ./syn3backup.pkg
    28286e3b8805854d12fd1b73056e96357640  ./syn3backup.SlackBuild
    29 0c7e2234bb90f7a43a8e9fd1b053eea5  ./syn3backup.SlackBuild.log.gz
     29d8c0858eb5e6dbc3d4589b5ee548b579  ./syn3backup.SlackBuild.log.gz
    3030ac50b66df20fa5fee5fb8ec431ede26e  ./updatelang.sh

  • npl/syn3/backup/syn3backup.pkg

    • Property mode changed from 100755 to 100644
Note: See TracChangeset for help on using the changeset viewer.