diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index 506de3a..08958e0 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -31,7 +31,7 @@ #### OFUNCTIONS MINI SUBSET #### #### OFUNCTIONS MICRO SUBSET #### _OFUNCTIONS_VERSION=2.3.0-dev-postRC2 -_OFUNCTIONS_BUILD=2019080904 +_OFUNCTIONS_BUILD=2019081401 #### _OFUNCTIONS_BOOTSTRAP SUBSET #### _OFUNCTIONS_BOOTSTRAP=true #### _OFUNCTIONS_BOOTSTRAP SUBSET END #### @@ -57,7 +57,7 @@ _LOGGER_VERBOSE=false _LOGGER_ERR_ONLY=false _LOGGER_PREFIX="date" if [ "$KEEP_LOGGING" == "" ]; then - KEEP_LOGGING=1801 + KEEP_LOGGING=30 fi # Initial error status, logging 'WARN', 'ERROR' or 'CRITICAL' will enable alerts flags @@ -2021,6 +2021,11 @@ function PreInit { SSH_OPTS="$SSH_OPTS -o ControlMaster=auto -o ControlPersist=yes -o ControlPath=\"$RUN_DIR/$PROGRAM.ctrlm.%r@%h.$SCRIPT_PID.$TSTAMP\"" fi + ## Optional SSH arguments + if [ "$SSH_OPTIONAL_ARGS" != "" ]; then + SSH_OPTS="$SSH_OPTS $SSH_OPTIONAL_ARGS" + fi + ## Support for older config files without RSYNC_EXECUTABLE option if [ "$RSYNC_EXECUTABLE" == "" ]; then RSYNC_EXECUTABLE=rsync diff --git a/sync.conf.example b/sync.conf.example index 625ad94..07fe71d 100644 --- a/sync.conf.example +++ b/sync.conf.example @@ -64,9 +64,15 @@ PATH_SEPARATOR_CHAR=";" [REMOTE_OPTIONS] -## ssh compression should be used unless your remote connection is good enough (LAN) +## ssh compression should be used on WAN links, unless your remote connection is good enough (LAN), in which case it would slow down things SSH_COMPRESSION=true +## Optional ssh options. Example to lower CPU usage on ssh compression, one can specify '-T -c arcfour -o Compression=no -x' +## -T = turn off pseudo-tty, -c arcfour = weakest but fasted ssh encryption (destination must accept "Ciphers arcfour" in sshd_config), -x turns off X11 forwarding +## arcfour isn't accepted on most newer systems, you may then prefer any AES encryption if processor has aes-ni hardware acceleration +## Uncomment the following line to use those optimizations, on secured links only +#SSH_OPTIONAL_ARGS="-T -c aes128-ctr -o Compression=no -x" + ## Ignore ssh known hosts. DANGER WILL ROBINSON DANGER ! This can lead to security issues. Only enable this if you know what you're doing. SSH_IGNORE_KNOWN_HOSTS=false