Merge branch 'master' of github.com:axkibe/lsyncd

This commit is contained in:
Axel Kittenberger 2013-05-15 00:44:36 +02:00
commit 46d23d59b3
5 changed files with 22 additions and 18 deletions

View File

@ -313,8 +313,8 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
Lsyncd version 2.X, Copyright (C) 2013 Axel Kittenberger
Lsyncd comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@ -328,7 +328,7 @@ school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
`Lsyncd' (which makes synchronises directories) written by Axel Kittenberger.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice

View File

@ -2,11 +2,11 @@ Lsyncd -- Live Syncing (Mirror) Daemon
======================================
Description
-----------
Lsyncd watches a local directory trees event monitor interface (inotify or fsevents). It aggregates and combines events for a few seconds and then spawns one (or more) process(es) to synchronize the changes. By default this is [rsync](http://rsync.samba.org/). Lsyncd is thus a light-weight live mirror solution that is comparatively easy to install not requiring new filesystems or blockdevices and does not hamper local filesystem performance.
Lsyncd watches a local directory trees event monitor interface (inotify or fsevents). It aggregates and combines events for a few seconds and then spawns one (or more) process(es) to synchronize the changes. By default this is [rsync](http://rsync.samba.org/). Lsyncd is thus a light-weight live mirror solution that is comparatively easy to install not requiring new filesystems or block devices and does not hamper local filesystem performance.
Rsync+ssh is an advanced action configuration that uses a SSH to act file and directory moves directly on the target instead of retransmitting the move destination over the wire.
Rsync+ssh is an advanced action configuration that uses a SSH to act file and directory moves directly on the target instead of re-transmitting the move destination over the wire.
Fine-grained customizaton can be achieved through the config file. Custom action configs can even be written from scratch in cascading layers ranging from shell scripts to code written in the [Lua language](http://www.lua.org/) This way simplicity can be balanced with powerfulness. See the manual for details [Lsyncd20Manual](https://github.com/axkibe/lsyncd/wiki/Manual-to-Lsyncd-2.0.x)
Fine-grained customization can be achieved through the config file. Custom action configs can even be written from scratch in cascading layers ranging from shell scripts to code written in the [Lua language](http://www.lua.org/). This way simple, powerful and flexible configurations can be acheived. See the manual for details [Lsyncd21Manual](https://github.com/axkibe/lsyncd/wiki/Manual-to-Lsyncd-2.1.x)
License: [GPLv2](http://www.fsf.org/licensing/licenses/info/GPLv2.html) or any later GPL version.
@ -16,7 +16,7 @@ Lsyncd is designed to synchronize a local directory tree with low profile of exp
Other synchronization tools
------------------------
[DRBD](http://www.drbd.org) operates on block device level. This makes it useful for synchronizing systems that are under heavy load. Lsyncd on the other hand does not require you to change block devices and/or mount points, allows you to change uid/gid of the transferred files, separates the receiver through the one-way nature of rsync. DRBD is likely the better option if you are syncing Databases.
[DRBD](http://www.drbd.org) operates on block device level. This makes it useful for synchronizing systems that are under heavy load. Lsyncd on the other hand does not require you to change block devices and/or mount points, allows you to change uid/gid of the transferred files, separates the receiver through the one-way nature of rsync. DRBD is likely the better option if you are syncing databases.
[GlusterFS](http://www.gluster.org) and [BindFS](http://www.cs.helsinki.fi/u/partel/bindfs/) use a FUSE-Filesystem to interject kernel/userspace filesystem events.
@ -24,16 +24,15 @@ Lsyncd usage examples
---------------------
```lsyncd -rsync /home remotehost.org::share/```
This watches and rsycn´s the local directory /home with all subdirectories and
This watches and rsyncs the local directory /home with all sub-directories and
transfers them to 'remotehost' using the rsync-share 'share'.
```lsyncd -rsyncssh /home remotehost.org backup-home/```
This will also rsync/watch '/home', but it uses a ssh connection to make moves local on the remotehost instead of retransmitting the moved file over the wire.
This will also rsync/watch '/home', but it uses a ssh connection to make moves local on the remotehost instead of re-transmitting the moved file over the wire.
Some more complicated examples, tips and tricks you can find in the [Lsyncd20Manual](https://github.com/axkibe/lsyncd/wiki/Manual-to-Lsyncd-2.0.x).
Some more complicated examples, tips and tricks you can find in the [Lsyncd21Manual](https://github.com/axkibe/lsyncd/wiki/Manual-to-Lsyncd-2.1.x).
Disclaimer
----------
Besides the usual disclaimer in the license, we want to specifically emphasize that neither the authors nor any organization the authors are associated with can and will hold responsible for data-loss caused by possible malfunctions of Lsyncd.

View File

@ -76,6 +76,7 @@ rsync.checkgauge = {
rsync_path = true,
sparse = true,
temp_dir = true,
timeout = true,
times = true,
update = true,
verbose = true,
@ -481,6 +482,11 @@ rsync.prepare = function(
computedN = computedN + 1
end
if crsync.timeout then
computed[ computedN ] = '--timeout=' .. crsync.timeout
computedN = computedN + 1
end
if shortsN ~= 2 then
computed[ 1 ] = table.concat( shorts, '' )
else

View File

@ -31,17 +31,17 @@ Lsyncd(1) watches local directory trees through an event monitor interface
then spawns one or more processes to synchronize the changes. By default this
is rsync(1). Lsyncd is thus a light-weight asynchronous live mirror solution
that is comparatively easy to install not requiring new filesystems or
blockdevices and does not hamper local filesystem performance.
block devices and does not hamper local filesystem performance.
Rsync+ssh is an advanced action configuration that uses a SSH(1) to act file
and directory moves directly on the target instead of retransmitting the move
and directory moves directly on the target instead of re-transmitting the move
destination over the wire.
Fine-grained customization can be achieved through the CONFIG-FILE. Custom
action configs can even be written from scratch in cascading layers ranging
from shell scripts to code written in the LUA(1) language. This way simplicity
can be balanced with powerfulness. See the online manual for details on the
CONFIG-FILE http://code.google.com/p/lsyncd/wiki/Lsyncd20Manual
CONFIG-FILE https://github.com/axkibe/lsyncd/wiki/Manual-to-Lsyncd-2.0.x .
Note that under normal configuration Lsyncd will delete pre-existing files in
the target directories that are not present in the respective source directory.
@ -55,7 +55,7 @@ OPTIONS
Show a help message.
*-insist*::
Continues startup even if a startup rsync cannot connect.
Continues start up even if rsync cannot connect.
*-log* 'LEVEL'::
Controls which kind of events are logged. By default Lsyncd logs 'Normal'
@ -88,7 +88,7 @@ EXIT STATUS
SEE ALSO
--------
Online Manual: http://code.google.com/p/lsyncd/wiki/Lsyncd2
Online Manual: https://github.com/axkibe/lsyncd/wiki/Lsyncd-2.1.x-%E2%80%96-What's-New%3F
VERSION
------

View File

@ -1,8 +1,7 @@
-----
-- User configuration file for lsyncd.
--
-- This example uses local bash commands to keep two local
-- directory trees in sync.
-- This example uses just echos the operations
--
-----