Merge branch 'cleanup-before-RC3'

CHANGELOG.md

@@ -14,18 +14,29 @@ FAR FUTURE IMPROVEMENTS
 KNOWN ISSUES
 ------------
 
-- Still need more testing on BSD, MacOSX and Windows MSYS
+- RC3 is tested against Linux, FreeBSD and MacOS X. More testing needed in MSYS Windows environment.
+- Cannot finish sync if one replica contains a directory and the other replica contains a file named the same way (Unix doesn't allow this)
 
 UNDER WORK
 ----------
 
-!- Better deletion propagation (again). Using rsync for deletion propagation is definitly not working in all cases (especially empty sub directories)
+- sync test automation
 
 RECENT CHANGES
 --------------
 
+- 27 May 2014: Osync 0.99 RC3
+- Additionnal delete fix for *BSD and MSYS (deleted file list not created right)
+- Fixed dry mode to use non dry after run treelists to create delete lists
+- Added follow symlink parameter
+- Minor fixes in parameter list when bandwidth parameter is used
+- Added some additionnal checks for *BSD and MacOS environments
+- Changed /bin/bash to /usr/bin/env bash for sanity on other systems, also check for bash presence before running
+- Changed default behavior for quick sync tasks: Will try to resume failed sync tasks once
+- Some code cleanup for state filenames and sync action names
+- Fixed deletion propagation (again). Rsync is definitly not designed to delete a list of files / folders. Rsync replaced by rm function which downloads deletion list to remote system.
 - Added path detection for exclude list file
-- Added a simple init script working for RHEL / CentOS and an install script
+- Added a simple init script and an install script
 - Fixed an issue with MacOSX using rsync -E differently than other *nix (Thanks to Pierre Clement)
 - Multislave asynchronous task support (Thanks to Ulrich Norbisrath)
 	- This breaks compat with elder osync runs. Add the SYNC_ID suffix to elder state files to keep deleted file information.
@@ -39,7 +50,6 @@ RECENT CHANGES
 - Fixed a nasty bug preventing writing lock files on remote system as superuser
 - Gzipped logs are now deleted once sent
 - Fixed some typos (thanks to Pavel Kiryukhin)
-- Added a simple RHEL / CentOS compatible init script
 - Fixed a bug with double trailing slashes in certain sceanrios
 - Sync execution don't fails anymore if files vanish during execution, also vanished files get logged
 - Add eventual "comm -23" replacement by "grep -F -x -v -f" to enhance compatibility with other platforms (comm is still much faster than grep, so we keep it)

install.sh

@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+SCRIPT_BUILD=2605201401
 
 ## Osync daemon install script
 ## Tested on RHEL / CentOS 6

osync-srv

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # osync two way directory sync tool
 #
@@ -12,6 +12,7 @@ progpath=/usr/local/bin
 confdir=/etc/osync
 pidfile=/var/run/$prog
 lockfile=/var/lock/subsys/$prog
+SCRIPT_BUILD=2605201401
 
 if [ ! -f $progpath/$progexec ] && [ ! -f $progexec ]
 then

sync.conf

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ###### Osync - Rsync based two way sync engine with fault tolerance
 ###### (L) 2013-2014 by Orsiris "Ozy" de Jong (www.netpower.fr)
-###### Config file rev 2205201401
+###### Config file rev 2705201401
 
 ## ---------- GENERAL OPTIONS
 
@@ -12,7 +12,7 @@ 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"
-#SLAVE_SYNC_DIR="ssh://user@host.com:22//path/to/dir2"
+#SLAVE_SYNC_DIR="ssh://backupuser@yourhost.old:22//home/git/osync/dir2"
 ## If slave replica is a remote directory, you must specifiy a RSA key (please use full path). Please see documentation for further information.
 SSH_RSA_PRIVATE_KEY="/home/backupuser/.ssh/id_rsa"
 
@@ -24,7 +24,8 @@ LOGFILE=""
 
 ## List of directories to exclude from sync on both sides (rsync patterns, wildcards work).
 ## Paths are relative to sync dirs. List elements are separated by a semicolon.
-RSYNC_EXCLUDE_PATTERN="tmp;archives"
+RSYNC_EXCLUDE_PATTERN=""
+#RSYNC_EXCLUDE_PATTERN="tmp;archives"
 ## 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.
@@ -39,7 +40,7 @@ MINIMUM_SPACE=10240
 ## Bandwidth limit Kbytes / second. Leave 0 to disable limitation
 BANDWIDTH=0
 
-## If enabled, synchronization will be processed as superuser. See documentation for /etc/sudoers file configuration.
+## If enabled, synchronization on remote system will be processed as superuser. See documentation for /etc/sudoers file configuration.
 SUDO_EXEC=no
 ## Paranoia option. Don't change this unless you read the documentation.
 RSYNC_EXECUTABLE=rsync
@@ -66,6 +67,8 @@ RSYNC_REMOTE_PATH=""
 PRESERVE_ACL=no
 ## Preserve Xattr. Make sure source and target FS can manage same Xattrs or you'll get loads of errors.
 PRESERVE_XATTR=no
+## Transforms symlinks into referent files/dirs
+COPY_SYMLINKS=no
 ## Preserve hard links. Make sure source and target FS can manage hard links or you will lose them.
 PRESERVE_HARDLINKS=no
 
@@ -79,7 +82,7 @@ HARD_MAX_EXEC_TIME=10600
 ## Minimum time (in seconds) in file monitor mode between modification detection and sync task in order to let copy operations finish.
 MIN_WAIT=60
 
-## ---------- BACKUP AND TRASH OPTIONS
+## ---------- BACKUP AND DELETION OPTIONS
 
 ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
 CONFLICT_BACKUP=yes
@@ -110,8 +113,8 @@ FORCE_STRANGER_LOCK_RESUME=no
 DESTINATION_MAILS="your@alert.tld"
 
 ## Windows (MSYS environment) only mail options (used with sendemail.exe from Brandon Zehm)
-SENDER_MAIL="alert@your.system"
-SMTP_SERVER=smtp.your.isp.com
+SENDER_MAIL="alert@your.system.tld"
+SMTP_SERVER=smtp.your.isp.tld
 SMTP_USER=
 SMTP_PASSWORD=