diff --git a/osync.sh b/osync.sh old mode 100755 new mode 100644 index 234dd8c..d0248a9 --- a/osync.sh +++ b/osync.sh @@ -4,7 +4,7 @@ PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance AUTHOR="(L) 2013-2014 by Orsiris \"Ozy\" de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" PROGRAM_VERSION=0.99RC4 -PROGRAM_BUILD=2611201401 +PROGRAM_BUILD=2711201401 ## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode if ! type -p "$BASH" > /dev/null @@ -204,7 +204,7 @@ function SendAlert Log "Current task is a quicksync task. Will not send any alert." return 0 fi - eval "cat $LOG_FILE $COMPRESSION_PROGRAM > $ALERT_LOG_FILE" + eval "cat \"$LOG_FILE\" $COMPRESSION_PROGRAM > $ALERT_LOG_FILE" MAIL_ALERT_MSG=$MAIL_ALERT_MSG$'\n\n'$(tail -n 25 "$LOG_FILE") if type -p mutt > /dev/null 2>&1 then @@ -2000,7 +2000,12 @@ function SyncOnChanges # Comand line argument flags dryrun=0 silent=0 -verbose=0 +if [ "$DEBUG" == "yes" ] +then + verbose=1 +else + verbose=0 +fi stats=0 PARTIAL=0 force_unlock=0 diff --git a/sync.conf b/sync.conf index 7fb41aa..7bd4e31 100755 --- a/sync.conf +++ b/sync.conf @@ -2,7 +2,7 @@ ###### Osync - Rsync based two way sync engine with fault tolerance ###### (L) 2013-2014 by Orsiris "Ozy" de Jong (www.netpower.fr) -###### Config file rev 2411201401 +###### Config file rev 2611201401 ## ---------- GENERAL OPTIONS @@ -27,14 +27,16 @@ LOGFILE="" ## Paths are relative to sync dirs. List elements are separated by a semicolon. RSYNC_EXCLUDE_PATTERN="" #RSYNC_EXCLUDE_PATTERN="tmp;archives" -## List elements separator char. You may set an alternative seperator char for your directories lists above. -PATH_SEPARATOR_CHAR=";" + ## File that contains the list of directories or files to exclude from sync on both sides. Leave this empty if you don't want to use an exclusion file. ## This file has to be in the same directory as the config file ## Paths are relative to sync dirs. One element per line. RSYNC_EXCLUDE_FROM="" #RSYNC_EXCLUDE_FROM="exclude.list" +## List elements separator char. You may set an alternative seperator char for your directories lists above. +PATH_SEPARATOR_CHAR=";" + ## Generate an alert if master or slave replicas have less free space than given value in KB. MINIMUM_SPACE=10240