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

Minor fixes

This commit is contained in:
deajan 2013-08-25 12:39:13 +02:00
parent cfb151da4e
commit eb0bb0a3f8
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,6 +1,8 @@
## FUTURE IMPROVEMENTS ## FUTURE IMPROVEMENTS
- Exit trap function must also stop child processes
- Rewrite rsync exclude patterns using \"pattern\" instead of escaped chars - Rewrite rsync exclude patterns using \"pattern\" instead of escaped chars
- Obackup should run on Cygwin
## Known issues ## Known issues
@ -8,8 +10,12 @@
## Latest changelog ## Latest changelog
- Improved verbose output
- Improved dryrun output
- Improved remote connecivity detection
- Fixed a typo in configuration file
- 18 Aug. 2013: Now v1.84 RC2 - 18 Aug. 2013: Now v1.84 RC2
- Added personalized log file option - Added possibility to change default logfile
- Simplified dryrun (removed dryrun function and merged it with main function) - Simplified dryrun (removed dryrun function and merged it with main function)
- Simplified Init function - Simplified Init function
- Added --stat switch to rsync execution - Added --stat switch to rsync execution

19
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.84preRC3 OBACKUP_VERSION=1.84preRC3
OBACKUP_BUILD=2408201302 OBACKUP_BUILD=2508201301
DEBUG=no DEBUG=no
SCRIPT_PID=$$ SCRIPT_PID=$$
@ -797,7 +797,7 @@ function FilesBackup
child_pid=$! child_pid=$!
WaitForTaskCompletion $child_pid $SOFT_MAX_EXEC_TIME_FILE_TASK $HARD_MAX_EXEC_TIME_FILE_TASK WaitForTaskCompletion $child_pid $SOFT_MAX_EXEC_TIME_FILE_TASK $HARD_MAX_EXEC_TIME_FILE_TASK
retval=$? retval=$?
if [ $verbose -eq 1 ] if [ $verbose -eq 1 ] && [ -f /dev/shm/obackup_rsync_output_$SCRIPT_PID ]
then then
Log "List:\n$(cat /dev/shm/obackup_rsync_output_$SCRIPT_PID)" Log "List:\n$(cat /dev/shm/obackup_rsync_output_$SCRIPT_PID)"
fi fi
@ -805,10 +805,10 @@ function FilesBackup
if [ $retval -ne 0 ] if [ $retval -ne 0 ]
then then
LogError "Backup failed on remote files." LogError "Backup failed on remote files."
if [ -f /dev/shm/obackup_rsync_output_$SCRIPT_PID ] if [ $verbose -eq 0 ] && [ -f /dev/shm/obackup_rsync_output_$SCRIPT_PID ]
then then
LogError "$(cat /dev/shm/obackup_rsync_output_$SCRIPT_PID)" LogError "$(cat /dev/shm/obackup_rsync_output_$SCRIPT_PID)"
fi fi
else else
Log "Backup succeeded." Log "Backup succeeded."
fi fi
@ -824,10 +824,15 @@ function FilesBackup
child_pid=$! child_pid=$!
WaitForTaskCompletion $child_pid $SOFT_MAX_EXEC_TIME_FILE_TASK $HARD_MAX_EXEC_TIME_FILE_TASK WaitForTaskCompletion $child_pid $SOFT_MAX_EXEC_TIME_FILE_TASK $HARD_MAX_EXEC_TIME_FILE_TASK
retval=$? retval=$?
if [ $verbose -eq 1 ] && [ -f /dev/shm/obackup_rsync_output_$SCRIPT_PID ]
then
Log "List:\n$(cat /dev/shm/obackup_rsync_output_$SCRIPT_PID)"
fi
if [ $retval -ne 0 ] if [ $retval -ne 0 ]
then then
LogError "Backup failed on remote files." LogError "Backup failed on remote files."
if [ -f /dev/shm/obackup_rsync_output_$SCRIPT_PID ] if [ $verbose -eq 0 ] && [ -f /dev/shm/obackup_rsync_output_$SCRIPT_PID ]
then then
LogError "$(cat /dev/shm/obackup_rsync_output_$SCRIPT_PID)" LogError "$(cat /dev/shm/obackup_rsync_output_$SCRIPT_PID)"
fi fi

6
obackup_ssh_filter.sh → ssh_filter.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
##### Obackup ssh command filter build 2306201301 ##### Obackup / Osync ssh command filter build 2306201301
##### This script should be located in /usr/local/bin in the remote system that will be backed up ##### This script should be located in /usr/local/bin in the remote system that will be backed up / synced
##### It will filter the commands that can be run remotely via ssh. ##### It will filter the commands that can be run remotely via ssh.
##### Please chmod 755 and chown root:root this file ##### Please chmod 755 and chown root:root this file
@ -14,7 +14,7 @@ CMD1=
CMD2= CMD2=
CMD3= CMD3=
LOG_FILE=~/.ssh/obackup_ssh_filter.log LOG_FILE=~/.ssh/ssh_filter.log
function Log function Log
{ {