From 5076bf2a931dc119760bab292d1e20cbeef92da1 Mon Sep 17 00:00:00 2001 From: Jody Date: Mon, 14 Sep 2015 23:57:32 -0700 Subject: [PATCH 1/2] Fix two typos in osync.sh --- osync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osync.sh b/osync.sh index 0c005a1..d5fad9c 100755 --- a/osync.sh +++ b/osync.sh @@ -1571,7 +1571,7 @@ function Sync { resume_sync=none fi else - Logger "Will not resume aborted osync execution. Too much resume tries [$resume_count]." "WARN" + Logger "Will not resume aborted osync execution. Too many resume tries [$resume_count]." "WARN" echo "noresume" > "$INITIATOR_LAST_ACTION" echo "0" > "$INITIATOR_RESUME_COUNT" resume_sync=none @@ -2117,7 +2117,7 @@ function Usage { echo "--rsakey=\"\" Alternative path to rsa private key for ssh connection to target replica" echo "--sync-id=\"\" Optional sync task name to identify this synchronization task when using multiple targets" echo "" - echo "Additionnaly, you may set most osync options at runtime. eg:" + echo "Additionaly, you may set most osync options at runtime. eg:" echo "SOFT_DELETE_DAYS=365 osync.sh --initiator=/path --target=/other/path" echo "" exit 128 From a7a77907bc1808cf94eba990eddebd67481a780d Mon Sep 17 00:00:00 2001 From: Jody Date: Tue, 15 Sep 2015 00:01:51 -0700 Subject: [PATCH 2/2] Update pathnames in example config file to match the code. --- sync.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sync.conf b/sync.conf index ff37f4f..a421873 100644 --- a/sync.conf +++ b/sync.conf @@ -10,8 +10,8 @@ SYNC_ID="sync_test" ## Directories to synchronize. Master must be on the system Osync runs on. Slave can be either a local directory, or a remote one. -MASTER_SYNC_DIR="/home/git/osync/dir1" -SLAVE_SYNC_DIR="/home/git/osync/dir2" +INITIATOR_SYNC_DIR="/home/git/osync/dir1" +TARGET_SYNC_DIR="/home/git/osync/dir2" #SLAVE_SYNC_DIR="ssh://backupuser@yourhost.old:22//home/git/osync/dir2" ## If slave replica is a remote directory, you must specify a RSA key (please use full path). Please see documentation for further information. SSH_RSA_PRIVATE_KEY="/home/backupuser/.ssh/id_rsa"