|
|
|
@ -6,8 +6,8 @@
|
|
|
|
|
PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
|
|
|
|
|
AUTHOR="(C) 2013-2019 by Orsiris de Jong"
|
|
|
|
|
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
|
|
|
|
|
PROGRAM_VERSION=1.3.0-beta3
|
|
|
|
|
PROGRAM_BUILD=2019052201
|
|
|
|
|
PROGRAM_VERSION=1.3.0-beta3+dev
|
|
|
|
|
PROGRAM_BUILD=2019052202
|
|
|
|
|
IS_STABLE=false
|
|
|
|
|
|
|
|
|
|
CONFIG_FILE_REVISION_REQUIRED=1.3.0
|
|
|
|
@ -43,7 +43,7 @@ CONFIG_FILE_REVISION_REQUIRED=1.3.0
|
|
|
|
|
# CleanUp no #__WITH_PARANOIA_DEBUG
|
|
|
|
|
|
|
|
|
|
_OFUNCTIONS_VERSION=2.3.0-dev-postRC2
|
|
|
|
|
_OFUNCTIONS_BUILD=2019052103
|
|
|
|
|
_OFUNCTIONS_BUILD=2019052201
|
|
|
|
|
_OFUNCTIONS_BOOTSTRAP=true
|
|
|
|
|
|
|
|
|
|
if ! type "$BASH" > /dev/null; then
|
|
|
|
@ -1981,7 +1981,10 @@ function RsyncPatterns {
|
|
|
|
|
RsyncPatternsFromAdd "exclude" "$RSYNC_EXCLUDE_FROM"
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
Logger "Bogus RSYNC_PATTERN_FIRST value in config file. Will not use rsync patterns." "WARN"
|
|
|
|
|
# osync target-helper specific clause
|
|
|
|
|
if [ "$_SYNC_ON_CHANGES" != "target" ]; then
|
|
|
|
|
Logger "Bogus RSYNC_PATTERN_FIRST value in config file. Will not use rsync patterns." "WARN"
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -2526,7 +2529,7 @@ function CheckCurrentConfig {
|
|
|
|
|
declare -a num_vars=(MINIMUM_SPACE BANDWIDTH SOFT_MAX_EXEC_TIME HARD_MAX_EXEC_TIME KEEP_LOGGING MIN_WAIT MAX_WAIT CONFLICT_BACKUP_DAYS SOFT_DELETE_DAYS RESUME_TRY MAX_EXEC_TIME_PER_CMD_BEFORE MAX_EXEC_TIME_PER_CMD_AFTER)
|
|
|
|
|
# target-helper runs need less configuration
|
|
|
|
|
else
|
|
|
|
|
declare -a booleans=(SUDO_EXEC SSH_COMPRESSION SSH_IGNORE_KNOWN_HOSTS REMOTE_HOST_PING STOP_ON_CMD_ERROR RUN_AFTER_CMD_ON_ERROR)
|
|
|
|
|
declare -a booleans=(SUDO_EXEC SSH_COMPRESSION SSH_IGNORE_KNOWN_HOSTS REMOTE_HOST_PING)
|
|
|
|
|
declare -a num_vars=(KEEP_LOGGING MIN_WAIT MAX_WAIT)
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
@ -6228,7 +6231,7 @@ function SyncOnChanges {
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
watchDirectory="$TARGET_SYNC_DIR"
|
|
|
|
|
Logger "#### Running $PROGRAM in target helper file monitor mode." "NOTICE"
|
|
|
|
|
Logger "#### Running $PROGRAM in target helper file monitor mode." "NOTICE"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
while true; do
|
|
|
|
|