From 50c7f2fd82d877ee6387d60ca3c5aa4504ed1c94 Mon Sep 17 00:00:00 2001 From: deajan Date: Sun, 4 Aug 2013 16:16:27 +0200 Subject: [PATCH] various minor fixes. --- CHANGELOG.md | 3 +++ host_backup.conf | 10 +++++----- obackup.sh | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d1b547..86779ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## 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 - Fixed CleanUp even if DEBUG=yes - 16 Jul. 2013 Feature freeze, version tagged as v1.84 RC1 diff --git a/host_backup.conf b/host_backup.conf index 139bf68..63e0de6 100755 --- a/host_backup.conf +++ b/host_backup.conf @@ -2,7 +2,7 @@ ###### Remote (or local) backup script for files & databases ###### (L) 2013 by Ozy de Jong (www.badministrateur.com) -###### Config file rev 2106201301 +###### Config file rev 0408201301 ## Backup identification, any string you want BACKUP_ID="your backup name" @@ -23,7 +23,7 @@ BACKUP_SIZE_MINIMUM=1024 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. -SUDO_EXEC=yes +SUDO_EXEC=no ## Paranoia option. Don't change this unless you read the documentation and still feel concerned about security issues. 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. 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. -REMOTE_3RD_PARTY_HOST="www.kernel.org" +REMOTE_3RD_PARTY_HOST="www.kernel.org www.google.com" ## Databases options 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}) 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_ACL=yes +PRESERVE_ACL=no ## Preserve Xattr -PRESERVE_XATTR=yes +PRESERVE_XATTR=no ## Let RSYNC compress file transfers. Do not use if you already enabled SSH compression. 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 diff --git a/obackup.sh b/obackup.sh index 22f1106..889f195 100755 --- a/obackup.sh +++ b/obackup.sh @@ -3,7 +3,7 @@ ###### Remote (or local) backup script for files & databases ###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr) OBACKUP_VERSION=1.84RC1 -OBACKUP_BUILD=2007201303 +OBACKUP_BUILD=0408201301 DEBUG=no SCRIPT_PID=$$ @@ -190,9 +190,10 @@ function LoadConfigFile then LogError "Cannot load backup configuration file [$1]. Backup cannot start." return 1 - elif [[ $1 != *.conf ]] + elif [[ "$1" != *".conf" ]] then LogError "Wrong configuration file supplied [$1]. Backup cannot start." + return 1 else egrep '^#|^[^ ]*=[^;&]*' "$1" > "/dev/shm/obackup_config_$SCRIPT_PID" source "/dev/shm/obackup_config_$SCRIPT_PID"