From: micah Date: Tue, 6 Nov 2007 21:20:36 +0000 (+0000) Subject: add example.rsync and updated rsync handler from rhatto X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=90a05aa59153f9cce0124507c390b1f19ce6bfb7;p=matthijs%2Fupstream%2Fbackupninja.git add example.rsync and updated rsync handler from rhatto git-svn-id: http://code.autistici.org/svn/backupninja/trunk@488 758a04ac-41e6-0310-8a23-8373a73cc35d --- diff --git a/ChangeLog b/ChangeLog index 0dacc94..7682a29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ version 0.9.5 -- unreleased . Renamed handler to 'rsync', replaces outdated rub handler . updated examples/Makefile.am and handlers/Makefile.am to include rsnap/rsync (Closes: #440554) + . Added example.rsync configuration file sys: . Fixed typo breaking things for VServers. . Fix bug when vrootdir is on its own partition (Closes: #395928) diff --git a/examples/Makefile.am b/examples/Makefile.am index 5dfb7c3..8669e86 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,6 @@ EXAMPLES = example.dup example.ldap example.makecd example.mysql \ - example.pgsql example.rdiff example.sh \ + example.pgsql example.rdiff example.sh example.rsync \ example.svn example.sys example.trac EXTRA_DIST = $(EXAMPLES) diff --git a/handlers/rsync.in b/handlers/rsync.in index d3d704c..bb03436 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -19,6 +19,7 @@ # backupdir = folder relative do $mountpoint where the backup should be stored # days = number of backup increments (min = 5) # lockfile = lockfile to be kept during backup execution +# nicelevel = rsync command nice level # enable_mv_timestamp_bug = set to "yes" if your system isnt handling timestamps correctly # tmp = temp folder # @@ -34,7 +35,7 @@ # numericids = when set to 1, use numeric ids instead of user/group mappings on rsync # compress = if set to 1, compress data on rsync (remote source only) # bandwidthlimit = set a badnwidth limit in kbps (remote source only) -# remote_rsync = remove rsync program (remote source only) +# remote_rsync = remote rsync program (remote source only) # # [services] # initscripts = absolute path where scripts are located @@ -63,7 +64,7 @@ getconf mv mv getconf fsck fsck setsection general -getconf log /var/log/backupninja-rsync.log +getconf log /var/log/backup/rsync.log getconf partition getconf fscheck getconf read_only @@ -100,7 +101,7 @@ getconf service function rotate { - if [[ "$2" -lt 4 ]]; then + if [[ "$2" < 4 ]]; then error "Rotate: minimum of 4 rotations" exit 1 fi