Bugfixes...
This commit is contained in:
parent
973e032835
commit
a1420a635b
|
@ -1,21 +1,21 @@
|
||||||
osync
|
osync
|
||||||
=====
|
=====
|
||||||
|
|
||||||
A two way sync script based on rsync that merges obackup script fault tolerance with sync logic derived from bitpocket project.
|
A two way sync script based that adds script fault tolerance from obackup project.
|
||||||
|
|
||||||
## About
|
## About
|
||||||
|
|
||||||
Having created obackup script in order to make reliable quick backups, i searched for a nice tool to handle two (or more) way sync scenarios in a reliable way.
|
Having created obackup script in order to make reliable quick backups, i searched for a nice tool to handle two (or more) way sync scenarios in a reliable way.
|
||||||
While unison handles these scenarios, it's pretty messy to configure, slow and won't handle ACLs.
|
While unison handles these scenarios, it's pretty messy to configure, slow and won't handle ACLs.
|
||||||
That's where bitpocket came handy, a nice script provided by sickill https://github.com/sickill/bitpocket.git
|
That's where bitpocket came handy, a nice script provided by sickill https://github.com/sickill/bitpocket.git
|
||||||
It's quick and small, but lacks some of the features i searched for like fault tolerance, stop and continue scenarios, and email warnings.
|
It's quick and small, but lacks some of the features i searched for like fault tolerance, stop and resume scenarios, and email warnings.
|
||||||
|
|
||||||
I then decided to merge my obackup codebase with bitpocket's sync core, osync was born.
|
I then decided to write my own implementation of a two way rsync sync script, which would the features i wanted.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
Not even beta ready yet. The whole code is not stable at all.
|
Not even beta ready yet. The whole code is not stable at all.
|
||||||
Hopefully will work by the end of July.
|
Hopefully will work (more or less) by the end of July. I'm developping this in my free time.
|
||||||
|
|
||||||
## Author
|
## Author
|
||||||
|
|
||||||
|
|
4
osync.sh
4
osync.sh
|
@ -411,9 +411,9 @@ function Sync
|
||||||
rsync -rlptgodEui --backup --backup-dir "$SLAVE_BACKUP_DIR" --exclude "$OSYNC_DIR" --exclude-from "$STATE_DIR/slave-deleted-list" --exclude-from "$STATE_DIR/master-deleted-list" $SLAVE_SYNC_DIR/ $MASTER_SYNC_DIR/
|
rsync -rlptgodEui --backup --backup-dir "$SLAVE_BACKUP_DIR" --exclude "$OSYNC_DIR" --exclude-from "$STATE_DIR/slave-deleted-list" --exclude-from "$STATE_DIR/master-deleted-list" $SLAVE_SYNC_DIR/ $MASTER_SYNC_DIR/
|
||||||
|
|
||||||
Log "Propagating deletitions to slave"
|
Log "Propagating deletitions to slave"
|
||||||
rsync -rlptgodEui --backup --backup-dir "$MASTER_DELETE_DIR" --delete --exclude "$OSYNC_DIR" --include-from "$STATE_DIR/master-deleted-list" --exclude='*' $MASTER_SYNC_DIR/ $SLAVE_SYNC_DIR/
|
rsync -rlptgodEui --backup --backup-dir "$MASTER_DELETE_DIR" --delete --exclude "$OSYNC_DIR" --include-from "$STATE_DIR/master-deleted-list" --exclude-from "$STATE_DIR/slave-deleted-list" $MASTER_SYNC_DIR/ $SLAVE_SYNC_DIR/
|
||||||
Log "Propagating deletitions to master"
|
Log "Propagating deletitions to master"
|
||||||
rsync -rlptgodEui --backup --backup-dir "$SLAVE_DELETE_DIR" --delete --exclude "$OSYNC_DIR" --include-from "$STATE_DIR/slave-deleted-list" --exclude='*' $SLAVE_SYNC_DIR/ $MASTER_SYNC_DIR/
|
rsync -rlptgodEui --backup --backup-dir "$SLAVE_DELETE_DIR" --delete --exclude "$OSYNC_DIR" --include-from "$STATE_DIR/slave-deleted-list" --exclude-from "$STATE_DIR/master-deleted-list" $SLAVE_SYNC_DIR/ $MASTER_SYNC_DIR/
|
||||||
|
|
||||||
## Create local file list
|
## Create local file list
|
||||||
Log "Creating new master file list"
|
Log "Creating new master file list"
|
||||||
|
|
Loading…
Reference in New Issue