Linux
/
obackup
mirror of https://github.com/deajan/obackup.git
1
0
Fork 0
Code Issues Releases Wiki Activity

various minor fixes.

This commit is contained in:
deajan 2013-08-04 16:16:27 +02:00
parent 72bab84ed5
commit 50c7f2fd82
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
## Latest changelog ## Latest changelog
- Fixed LoadConfigFile function will not warn on wrong config file
- More code cleanup
- Added --verbose parameter (yeah... Feature freeze i said ? Well this is not a feature)
- Improved task execution checks and more code cleanup - Improved task execution checks and more code cleanup
- Fixed CleanUp even if DEBUG=yes - Fixed CleanUp even if DEBUG=yes
- 16 Jul. 2013 Feature freeze, version tagged as v1.84 RC1 - 16 Jul. 2013 Feature freeze, version tagged as v1.84 RC1

10
host_backup.conf
View File

@ -2,7 +2,7 @@
###### Remote (or local) backup script for files & databases ###### Remote (or local) backup script for files & databases
###### (L) 2013 by Ozy de Jong (www.badministrateur.com) ###### (L) 2013 by Ozy de Jong (www.badministrateur.com)
###### Config file rev 2106201301 ###### Config file rev 0408201301
## Backup identification, any string you want ## Backup identification, any string you want
BACKUP_ID="your backup name" BACKUP_ID="your backup name"
@ -23,7 +23,7 @@ BACKUP_SIZE_MINIMUM=1024
LOCAL_STORAGE_WARN_MIN_SPACE=1048576 LOCAL_STORAGE_WARN_MIN_SPACE=1048576
## If enabled, file backups will be processed with sudo command. See documentation for /etc/sudoers configuration ("find", "du" and "rsync" need to be allowed). Requiretty needs to be disabled. ## If enabled, file backups will be processed with sudo command. See documentation for /etc/sudoers configuration ("find", "du" and "rsync" need to be allowed). Requiretty needs to be disabled.
SUDO_EXEC=yes SUDO_EXEC=no
## Paranoia option. Don't change this unless you read the documentation and still feel concerned about security issues. ## Paranoia option. Don't change this unless you read the documentation and still feel concerned about security issues.
RSYNC_EXECUTABLE=rsync RSYNC_EXECUTABLE=rsync
@ -38,7 +38,7 @@ SSH_COMPRESSION=yes
## Check for connectivity to remote host before launching remote backup tasks. Be sure the hosts responds to ping. Failing to ping will skip current task. ## Check for connectivity to remote host before launching remote backup tasks. Be sure the hosts responds to ping. Failing to ping will skip current task.
REMOTE_HOST_PING=yes REMOTE_HOST_PING=yes
## Check for internet access by pinging one or more 3rd party hosts before remote backup tasks. Leave empty if you don't want this check to be be performed. Failing to ping will skip current task. ## Check for internet access by pinging one or more 3rd party hosts before remote backup tasks. Leave empty if you don't want this check to be be performed. Failing to ping will skip current task.
REMOTE_3RD_PARTY_HOST="www.kernel.org" REMOTE_3RD_PARTY_HOST="www.kernel.org www.google.com"
## Databases options ## Databases options
SQL_USER=backupuser SQL_USER=backupuser
@ -68,9 +68,9 @@ DIRECTORIES_RECURSE_EXCLUDE_LIST="/home/backupuser;/home/lost+found"
## Be aware that every recurse list will have it's own root (exclude pattern is relative from /home/web for /home/web/{recursedir}) ## Be aware that every recurse list will have it's own root (exclude pattern is relative from /home/web for /home/web/{recursedir})
RSYNC_EXCLUDE_PATTERN="*/tmp;*/ftp/www/cache/cachefs;*/sessions" RSYNC_EXCLUDE_PATTERN="*/tmp;*/ftp/www/cache/cachefs;*/sessions"
## Preserve ACLS. Make sure target FS can hold ACLs or you'll get loads of errors. ## Preserve ACLS. Make sure target FS can hold ACLs or you'll get loads of errors.
PRESERVE_ACL=yes PRESERVE_ACL=no
## Preserve Xattr ## Preserve Xattr
PRESERVE_XATTR=yes PRESERVE_XATTR=no
## Let RSYNC compress file transfers. Do not use if you already enabled SSH compression. ## Let RSYNC compress file transfers. Do not use if you already enabled SSH compression.
RSYNC_COMPRESS=yes RSYNC_COMPRESS=yes
## Max execution time per file backup task. Soft is warning only. Hard is warning, stopping backup and processing next one one file list. Tilme is specified in seconds ## Max execution time per file backup task. Soft is warning only. Hard is warning, stopping backup and processing next one one file list. Tilme is specified in seconds

5
obackup.sh
View File

@ -3,7 +3,7 @@
###### Remote (or local) backup script for files & databases ###### Remote (or local) backup script for files & databases
###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr) ###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr)
OBACKUP_VERSION=1.84RC1 OBACKUP_VERSION=1.84RC1
OBACKUP_BUILD=2007201303 OBACKUP_BUILD=0408201301
DEBUG=no DEBUG=no
SCRIPT_PID=$$ SCRIPT_PID=$$
@ -190,9 +190,10 @@ function LoadConfigFile
then then
LogError "Cannot load backup configuration file [$1]. Backup cannot start." LogError "Cannot load backup configuration file [$1]. Backup cannot start."
return 1 return 1
elif [[ $1 != *.conf ]] elif [[ "$1" != *".conf" ]]
then then
LogError "Wrong configuration file supplied [$1]. Backup cannot start." LogError "Wrong configuration file supplied [$1]. Backup cannot start."
return 1
else else
egrep '^#|^[^ ]*=[^;&]*' "$1" > "/dev/shm/obackup_config_$SCRIPT_PID" egrep '^#|^[^ ]*=[^;&]*' "$1" > "/dev/shm/obackup_config_$SCRIPT_PID"
source "/dev/shm/obackup_config_$SCRIPT_PID" source "/dev/shm/obackup_config_$SCRIPT_PID"