From 25ad989fb72a53556421bd6e56c2275be9eadcab Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 24 Sep 2011 19:09:14 +0200 Subject: Make the .dup generated by ninjahelper more consistent with example.dup. I.e. document tmpdir. --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index feeb8c5..0c763f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +version 1.0 -- UNRELEASED + handler changes + dup: + . Make the .dup generated by ninjahelper more consistent with + example.dup. + version 0.9.10 -- September 23, 2011 backupninja changes . Fix email reports, that were broken by the new locking support. -- cgit v1.2.3 From f351306d82a5a98f1827643deefc7ed69ce98716 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 22 Oct 2011 21:46:50 +0200 Subject: dup: add support for RackSpace's CloudFiles. Thanks to Yuval Kogman for the patch. --- AUTHORS | 1 + ChangeLog | 2 ++ examples/example.dup | 10 ++++++++++ handlers/dup.helper.in | 10 ++++++++++ handlers/dup.in | 16 ++++++++++++++++ 5 files changed, 39 insertions(+) (limited to 'ChangeLog') diff --git a/AUTHORS b/AUTHORS index a4a5fa5..2393c1a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -41,3 +41,4 @@ Sergio Talens-Oliag -- pipefail fixes Bruno Bigras -- enable tar handler in the build system aihtdikh -- Allow 'when = XXX' with spaces in .sh files. Chris Lamb -- rdiff.helper bugfix +Yuval Kogman -- RackSpace's CloudFiles support for duplicity diff --git a/ChangeLog b/ChangeLog index 0c763f1..dd7418a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ version 1.0 -- UNRELEASED dup: . Make the .dup generated by ninjahelper more consistent with example.dup. + . Add support for RackSpace's CloudFiles. + Thanks to Yuval Kogman for the patch. version 0.9.10 -- September 23, 2011 backupninja changes diff --git a/examples/example.dup b/examples/example.dup index 5e6b424..77bda83 100644 --- a/examples/example.dup +++ b/examples/example.dup @@ -194,6 +194,16 @@ exclude = /var/cache/backupninja/duplicity # awsaccesskeyid = # awssecretaccesskey = +## RackSpace's CloudFiles username, API key, and authentication URL. +## cfusername = YOUR_CF_USERNAME +## cfapikey = YOUR_CF_API_KEY +## cfauthurl = YOUR_CF_AUTH_URL +## +## Default: +# cfusername = +# cfapikey = +# cfauthurl = + ## FTP password, needed for backups using desturl = ftp://... ## ## Default: diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in index 050cbca..ba2850f 100644 --- a/handlers/dup.helper.in +++ b/handlers/dup.helper.in @@ -454,6 +454,16 @@ keepincroffulls = $dup_keepincroffulls #awsaccesskeyid = YOUR_AWS_ACCESS_KEY_ID #awssecretaccesskey = YOUR_AWS_SECRET_KEY +## RackSpace's CloudFiles username, API key, and authentication URL. +## cfusername = YOUR_CF_USERNAME +## cfapikey = YOUR_CF_API_KEY +## cfauthurl = YOUR_CF_AUTH_URL +## +## Default: +# cfusername = +# cfapikey = +# cfauthurl = + # FTP password, needed for backups using desturl = ftp://... #ftp_password = diff --git a/handlers/dup.in b/handlers/dup.in index 40f6723..a3684c8 100644 --- a/handlers/dup.in +++ b/handlers/dup.in @@ -30,6 +30,9 @@ getconf keepincroffulls all getconf desturl getconf awsaccesskeyid getconf awssecretaccesskey +getconf cfusername +getconf cfapikey +getconf cfauthurl getconf ftp_password getconf sshoptions getconf bandwidthlimit 0 @@ -46,6 +49,9 @@ destdir=${destdir%/} if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" == "s3+http" ]; then [ -n "$awsaccesskeyid" -a -n "$awssecretaccesskey" ] || fatal "AWS access keys must be set for S3 backups." fi +if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" == "cf+http" ]; then + [ -n "$cfusername" -a -n "$cfapikey" ] || fatal "Cloudfiles access keys must be set for S3 backups." +fi if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" == "ftp" ]; then [ -n "$ftp_password" ] || fatal "ftp_password must be set for FTP backups." fi @@ -232,6 +238,16 @@ if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" == "s3+http" ]; then export AWS_SECRET_ACCESS_KEY="$awssecretaccesskey" fi +### If desturl is a RackSpace's CloudFiles URL export the relevant +### environment variables +if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" == "cf+http" ]; then + export CLOUDFILES_USERNAME="$cfusername" + export CLOUDFILES_APIKEY="$cfapikey" + if [ -n "$cfauthurl" ]; then + export CLOUDFILES_AUTHURL="$cfauthurl" + fi +fi + ### Cleanup commands (duplicity >= 0.4.4) # cleanup -- cgit v1.2.3 From 46000c030896cb8efe820e762d9d12ee663b5936 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 24 Dec 2011 11:11:48 -0200 Subject: Make numericids defaults to null (fixes #3691) --- ChangeLog | 2 ++ handlers/rsync.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index dd7418a..e1ac76d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ version 1.0 -- UNRELEASED handler changes + rysnc: + . Fix numericids option (Redmine#3691). dup: . Make the .dup generated by ninjahelper more consistent with example.dup. diff --git a/handlers/rsync.in b/handlers/rsync.in index 6c772e1..cc255a3 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -887,7 +887,7 @@ function set_filelist { function set_rsync_options { - if [ ! -z "$numericids" ]; then + if [ "$numericids" != "0" ]; then rsync_options="$rsync_options --numeric-ids" fi -- cgit v1.2.3 From 926152dfa1c3b076488bf768ae6cd2282cfa5497 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 24 Dec 2011 11:35:06 -0200 Subject: Mangle rsync_options just after all other options were evaluated (#3702) --- ChangeLog | 1 + handlers/rsync.in | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index e1ac76d..fa319b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ version 1.0 -- UNRELEASED handler changes rysnc: . Fix numericids option (Redmine#3691). + . Mangle $rsync_options just afterwards (Redmine#3702). dup: . Make the .dup generated by ninjahelper more consistent with example.dup. diff --git a/handlers/rsync.in b/handlers/rsync.in index 45b9b31..a17afbd 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -893,7 +893,7 @@ function set_rsync_options { if [ "$from" == "local" ] || [ "$dest" == "local" ]; then # rsync options for local sources or destinations - rsync_options=($rsync_options) + true fi if [ "$from" == "remote" ] || [ "$dest" == "remote" ]; then @@ -912,8 +912,6 @@ function set_rsync_options { remote_rsync="$remote_rsync --fake-super" fi - rsync_options=($rsync_options --rsync-path="$remote_rsync") - if [ "$protocol" == "ssh" ]; then if [ ! -e "$id_file" ]; then fatal "SSH Identity file $id_file not found" @@ -927,6 +925,14 @@ function set_rsync_options { fi + # Mangle rsync_options so we can use quotes after all other + # options were evaluated. + if [ "$from" == "local" ] && [ "$dest" == "local" ]; then + rsync_options=($rsync_options) + else + rsync_options=($rsync_options --rsync-path="$remote_rsync") + fi + include_vservers } -- cgit v1.2.3 From fb393b49c55c48023f9cd1d0f36a6fb60ae5b97f Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 1 Jan 2012 10:48:01 +0100 Subject: Update ChangeLog wrt. last cherry-picked patches. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index fa319b8..6fca086 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ version 1.0 -- UNRELEASED rysnc: . Fix numericids option (Redmine#3691). . Mangle $rsync_options just afterwards (Redmine#3702). + . Fix metadata rotation. + . Allow disabling rotation or setting 2 days as minimum for backup + increments in rsync short format (Redmine#2107). + . Use fatal instead of custom "exit 1" (Redmine#3721). + . Abort on rsync error (Redmine#3692). dup: . Make the .dup generated by ninjahelper more consistent with example.dup. -- cgit v1.2.3 From 0c4b164a58a0ce856f3253ab4b2cb8d6466ac923 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 4 Jan 2012 22:49:35 +0100 Subject: Update ChangeLog wrt. last cherry-picked patches. --- ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 6fca086..9a011c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ version 1.0 -- UNRELEASED increments in rsync short format (Redmine#2107). . Use fatal instead of custom "exit 1" (Redmine#3721). . Abort on rsync error (Redmine#3692). + . Cleanup orphaned metadata (Redmine#3727). dup: . Make the .dup generated by ninjahelper more consistent with example.dup. -- cgit v1.2.3 From b99ccd6303b599ea9ac90c17f9b40e08265df04e Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 24 Jan 2012 01:23:33 +0100 Subject: mysql: Don't attempt to dump performance_schema database (Redmine#3741). Locking its tables require privileges the 'debian-sys-maint'@'localhost' user is generally not granted. --- ChangeLog | 2 ++ handlers/mysql.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 9a011c0..5ca279d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ version 1.0 -- UNRELEASED example.dup. . Add support for RackSpace's CloudFiles. Thanks to Yuval Kogman for the patch. + mysql: + . Don't attempt to dump performance_schema database (Redmine#3741). version 0.9.10 -- September 23, 2011 backupninja changes diff --git a/handlers/mysql.in b/handlers/mysql.in index 185a98a..65deebb 100644 --- a/handlers/mysql.in +++ b/handlers/mysql.in @@ -256,7 +256,7 @@ then for db in $databases do DUMP_BASE="$MYSQLDUMP $defaultsfile $sqldumpoptions" - if [ "$db" = "information_schema" ] + if [ "$db" = "information_schema" ] || [ "$db" = "performance_schema" ] then DUMP_BASE="${DUMP_BASE} --skip-lock-tables" fi -- cgit v1.2.3 From 0a0fbb46baa1fd5e6bb68c9e3f9f0b28dfa17e15 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 29 Jan 2012 14:11:11 +0100 Subject: Workaround annoying automake sanity check. Recent versions of automake prevent us from installing lib/* into lib/backupninja/. Where else are be supposed to install such files anyway? --- ChangeLog | 4 ++++ lib/Makefile.am | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 5ca279d..65b9cc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,10 @@ version 1.0 -- UNRELEASED Thanks to Yuval Kogman for the patch. mysql: . Don't attempt to dump performance_schema database (Redmine#3741). + build system changes + . Workaround automake sanity check that would prevent us from + installing lib/* into lib/backupninja/. Where else are be supposed + to install such files anyway? version 0.9.10 -- September 23, 2011 backupninja changes diff --git a/lib/Makefile.am b/lib/Makefile.am index 11eba37..9a54736 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,7 @@ -pkglib_SCRIPTS = easydialog parseini tools vserver +my_execbindir = $(pkglibdir) +my_execbin_SCRIPTS = easydialog parseini tools vserver -CLEANFILES = $(pkglib_SCRIPTS) +CLEANFILES = $(my_execbin_SCRIPTS) EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in -- cgit v1.2.3 From 5bfa30bb22cbfe37e06c2c442fe77b5a02602184 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 29 Jan 2012 14:40:46 +0100 Subject: Support bandwidthlimit again with new duplicity, using trickle. duplicity 0.6.17 uses paramiko backend. Thus, it does not support limiting bandwidth anymore. Let's use trickle to support bandwidth shaping anyway. --- ChangeLog | 1 + handlers/dup.in | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 65b9cc5..65a994a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ version 1.0 -- UNRELEASED example.dup. . Add support for RackSpace's CloudFiles. Thanks to Yuval Kogman for the patch. + . Support bandwidthlimit with new duplicity, using trickle. mysql: . Don't attempt to dump performance_schema database (Redmine#3741). build system changes diff --git a/handlers/dup.in b/handlers/dup.in index 6fbb27a..b1de651 100644 --- a/handlers/dup.in +++ b/handlers/dup.in @@ -122,6 +122,11 @@ if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 6 -a "$duplicity_sub" -g || warning 'duplicity >= 0.6.17 only supports the IdentityFile SSH option' fi execstr_options="${execstr_options} --ssh-options '$sshoptions'" + # FIXME: use trickle + if [ "$bandwidthlimit" != 0 ]; then + [ -z "$desturl" ] || warning 'The bandwidthlimit option is not used when desturl is set.' + execstr_precmd="trickle -s -d $bandwidthlimit -u $bandwidthlimit" + fi ## duplicity < 0.6.17 : scp/sftp backend else scpoptions="$sshoptions" -- cgit v1.2.3 From e18e7a83e6b9110b348ba8caada6614344854b7a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 29 Jan 2012 16:44:33 +0100 Subject: Sort ChangeLog entries. --- ChangeLog | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 65a994a..a4e8862 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ version 1.0 -- UNRELEASED handler changes + dup: + . Make the .dup generated by ninjahelper more consistent with + example.dup. + . Add support for RackSpace's CloudFiles. + Thanks to Yuval Kogman for the patch. + . Support bandwidthlimit with new duplicity, using trickle. + mysql: + . Don't attempt to dump performance_schema database (Redmine#3741). rysnc: . Fix numericids option (Redmine#3691). . Mangle $rsync_options just afterwards (Redmine#3702). @@ -9,14 +17,6 @@ version 1.0 -- UNRELEASED . Use fatal instead of custom "exit 1" (Redmine#3721). . Abort on rsync error (Redmine#3692). . Cleanup orphaned metadata (Redmine#3727). - dup: - . Make the .dup generated by ninjahelper more consistent with - example.dup. - . Add support for RackSpace's CloudFiles. - Thanks to Yuval Kogman for the patch. - . Support bandwidthlimit with new duplicity, using trickle. - mysql: - . Don't attempt to dump performance_schema database (Redmine#3741). build system changes . Workaround automake sanity check that would prevent us from installing lib/* into lib/backupninja/. Where else are be supposed -- cgit v1.2.3 From 030e526694b6f21f2b1a9ab6c4d4eb9ab9402dfd Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 29 Jan 2012 16:45:24 +0100 Subject: Add Closes: for Debian bug. --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index a4e8862..272e280 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,8 @@ version 1.0 -- UNRELEASED example.dup. . Add support for RackSpace's CloudFiles. Thanks to Yuval Kogman for the patch. - . Support bandwidthlimit with new duplicity, using trickle. + . Support bandwidthlimit with new duplicity, using trickle + (Closes: #657201). mysql: . Don't attempt to dump performance_schema database (Redmine#3741). rysnc: -- cgit v1.2.3 From ae6f3bb7520f16a522353adc43e92ff11fdb8dd4 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 29 Jan 2012 19:32:34 +0100 Subject: Fix ChangeLog. --- ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 272e280..4bc3bbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,9 @@ version 1.0 -- UNRELEASED example.dup. . Add support for RackSpace's CloudFiles. Thanks to Yuval Kogman for the patch. - . Support bandwidthlimit with new duplicity, using trickle - (Closes: #657201). + . Adapt for new duplicity SSH backend. + Support bandwidthlimit with new duplicity, using trickle. + (Closes: #657201) mysql: . Don't attempt to dump performance_schema database (Redmine#3741). rysnc: -- cgit v1.2.3 From db168e41fd441fc022a8f39311385691b845b3e3 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 25 Feb 2012 13:30:09 +0100 Subject: pgsql: don't produce empty uncompressed backups (Redmine#3820). --- ChangeLog | 2 ++ handlers/pgsql.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 4bc3bbb..b56fee0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ version 1.0 -- UNRELEASED (Closes: #657201) mysql: . Don't attempt to dump performance_schema database (Redmine#3741). + pgsql: + . Don't produce empty uncompressed backups (Redmine#3820). rysnc: . Fix numericids option (Redmine#3691). . Mangle $rsync_options just afterwards (Redmine#3702). diff --git a/handlers/pgsql.in b/handlers/pgsql.in index a50d3c7..fc337a0 100644 --- a/handlers/pgsql.in +++ b/handlers/pgsql.in @@ -186,7 +186,7 @@ else if [ "$compress" == "yes" ]; then dumpcmd="set -o pipefail ; $PGSQLDUMP --format=$format ${disablecustomcompress} $db | $GZIP $GZIP_OPTS > '$backupdir/${db}.${dumpext}.gz'" else - dumpcmd="$PGSQLDUMP --format=$format ${disablecustomcompress} $db | > '$backupdir/${db}.${dumpext}'" + dumpcmd="$PGSQLDUMP --format=$format ${disablecustomcompress} $db > '$backupdir/${db}.${dumpext}'" fi if [ $usevserver = yes ]; then execstr="$VSERVER $vsname exec su - $PGSQLUSER -s /bin/bash -c \"$dumpcmd\"" -- cgit v1.2.3 From 39d050cd634ecdff85cc6b38000c067485cb78cb Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 25 Feb 2012 14:20:09 +0100 Subject: Update ChangeLog. --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index b56fee0..2268aa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ version 1.0 -- UNRELEASED . Workaround automake sanity check that would prevent us from installing lib/* into lib/backupninja/. Where else are be supposed to install such files anyway? + documentation changes + . Document what features available to .sh jobs (Redmine #1558). version 0.9.10 -- September 23, 2011 backupninja changes -- cgit v1.2.3 From 3ac357dd957c88b22575bdde9d65ae29fe073250 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 25 Feb 2012 14:54:23 +0100 Subject: Report failure of rdiff-backup jobs as such. --- ChangeLog | 2 ++ handlers/rdiff.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 2268aa4..8a75d2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ version 1.0 -- UNRELEASED . Don't attempt to dump performance_schema database (Redmine#3741). pgsql: . Don't produce empty uncompressed backups (Redmine#3820). + rdiff-backup: + . Use fatal function to report failure of rdiff-backup jobs as such. rysnc: . Fix numericids option (Redmine#3691). . Mangle $rsync_options just afterwards (Redmine#3702). diff --git a/handlers/rdiff.in b/handlers/rdiff.in index c2f5aa0..c3c8d1d 100644 --- a/handlers/rdiff.in +++ b/handlers/rdiff.in @@ -271,8 +271,8 @@ if [ $test = 0 ]; then debug $output info "Successfully finished backing up source $label" else - warning $output - warning "Failed backup up source $label" + error $output + fatal "Failed backup up source $label" fi fi -- cgit v1.2.3 From 3a94e3bc59e5592da73144668396ec8e3463e1fd Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 25 Feb 2012 15:04:38 +0100 Subject: Report duplicity failure output at error loglevel so that it is emailed. --- ChangeLog | 2 ++ handlers/dup.in | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 8a75d2f..c6fb650 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ version 1.0 -- UNRELEASED . Adapt for new duplicity SSH backend. Support bandwidthlimit with new duplicity, using trickle. (Closes: #657201) + . Report failure output at error loglevel so that it is emailed + (Closes: #536858) mysql: . Don't attempt to dump performance_schema database (Redmine#3741). pgsql: diff --git a/handlers/dup.in b/handlers/dup.in index f9f4de4..9eb2fbb 100644 --- a/handlers/dup.in +++ b/handlers/dup.in @@ -339,7 +339,11 @@ if [ ! $test ]; then exit_code=$? debug $output cat $outputfile | (while read output ; do - info $output + if [ $exit_code -eq 0 ]; then + info $output + else + error $output + fi done ) if [ $exit_code -eq 0 ]; then -- cgit v1.2.3 From 1f367b40cdb0c790b9c3a1e45fceb4ee79e93c31 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 26 Feb 2012 13:52:02 +0100 Subject: Update changelog. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index c6fb650..0eeea03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,7 +18,7 @@ version 1.0 -- UNRELEASED . Use fatal function to report failure of rdiff-backup jobs as such. rysnc: . Fix numericids option (Redmine#3691). - . Mangle $rsync_options just afterwards (Redmine#3702). + . Mangle $rsync_options just afterwards (Redmine#3702, Redmine#3001). . Fix metadata rotation. . Allow disabling rotation or setting 2 days as minimum for backup increments in rsync short format (Redmine#2107). -- cgit v1.2.3 From 1553fc794b17dfea592e142fdd01fd4669fa7fb9 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 26 Mar 2012 20:20:50 +0200 Subject: Update ChangeLog. --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 0eeea03..1e20e00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ version 1.0 -- UNRELEASED . Use fatal instead of custom "exit 1" (Redmine#3721). . Abort on rsync error (Redmine#3692). . Cleanup orphaned metadata (Redmine#3727). + . Use the backup start time and not the time the backup was finished + (Closes: #654192) build system changes . Workaround automake sanity check that would prevent us from installing lib/* into lib/backupninja/. Where else are be supposed -- cgit v1.2.3 From e5d922e7218026224db1930e12838f02bfd27563 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 15 May 2012 15:45:17 +0200 Subject: Updating ChangeLog. --- ChangeLog | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 1e20e00..32eb5cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ version 1.0 -- UNRELEASED (Closes: #657201) . Report failure output at error loglevel so that it is emailed (Closes: #536858) + maildir: + . Remove 'loadlimit' parameter - it is not used anywhere. mysql: . Don't attempt to dump performance_schema database (Redmine#3741). pgsql: @@ -22,11 +24,22 @@ version 1.0 -- UNRELEASED . Fix metadata rotation. . Allow disabling rotation or setting 2 days as minimum for backup increments in rsync short format (Redmine#2107). - . Use fatal instead of custom "exit 1" (Redmine#3721). . Abort on rsync error (Redmine#3692). . Cleanup orphaned metadata (Redmine#3727). - . Use the backup start time and not the time the backup was finished - (Closes: #654192) + . Use the backup start time and not the time the backup was finished. + (Closes: #654192). + . Use 'debug', 'fatal' and 'warning' functions instead of regular echo + and exit (Redmine#3840, Redmine#3721). + . Quoting $starttime (Redmine#3868). + . Validate created date on long_rotation to avoid too many arguments + at comparison (Redmine#3868). + . Quoting $exclude and $excludes and avoiding a for loop on $exclude + to not expand wildcards in beforehand (Redmine#3882). + . Quote excludes (Redmine#3882). + . Changing remaining 'exit' to 'fatal' at rsync handler (Redmine#3721). + . Removing duplicated locking support (Redmine#3838). + . Documenting rotation parameters at example.rsync (Redmine#3891). + . Ensure that a non-zero rsync exit status is caught (Redmine#3892). build system changes . Workaround automake sanity check that would prevent us from installing lib/* into lib/backupninja/. Where else are be supposed -- cgit v1.2.3 From d464a9742dd45202e86432714288330417cd415f Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 15 May 2012 16:58:25 +0200 Subject: Have "make dist" package handlers/*.in instead of make results. --- ChangeLog | 1 + handlers/Makefile.am | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 32eb5cd..f694af5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ version 1.0 -- UNRELEASED . Workaround automake sanity check that would prevent us from installing lib/* into lib/backupninja/. Where else are be supposed to install such files anyway? + . Have "make dist" ship handlers/*.in instead of make results. documentation changes . Document what features available to .sh jobs (Redmine #1558). diff --git a/handlers/Makefile.am b/handlers/Makefile.am index 54155e8..6c1969b 100644 --- a/handlers/Makefile.am +++ b/handlers/Makefile.am @@ -3,16 +3,20 @@ HANDLERS = dup dup.helper maildir makecd \ makecd.helper mysql mysql.helper pgsql pgsql.helper rdiff \ rdiff.helper rsync sh svn sys sys.helper trac tar tar.helper +DIST_HANDLERS = dup.in dup.helper.in maildir.in makecd.in \ + makecd.helper.in mysql.in mysql.helper.in pgsql.in pgsql.helper.in rdiff.in \ + rdiff.helper.in rsync.in sh.in svn.in sys.in sys.helper.in trac.in tar.in tar.helper.in wget + CLEANFILES = $(HANDLERS) -EXTRA_DIST = Makefile.am $(HANDLERS) +EXTRA_DIST = Makefile.am $(DIST_HANDLERS) edit = sed \ -e "s,@BASH\@,$(BASH),g" \ -e "s,@AWK\@,$(AWK),g" \ -e "s,@SED\@,$(SED),g" -dist_pkgdata_DATA = $(HANDLERS) +dist_pkgdata_DATA = $(DIST_HANDLERS) dup: $(srcdir)/dup.in rm -f dup -- cgit v1.2.3 From 17be899a23f41d1efed2783d2e91d46cf4802c34 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 15 May 2012 17:09:42 +0200 Subject: Have "make dist" ship the FAQ. --- ChangeLog | 1 + Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f694af5..0b2bf40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ version 1.0 -- UNRELEASED installing lib/* into lib/backupninja/. Where else are be supposed to install such files anyway? . Have "make dist" ship handlers/*.in instead of make results. + . Have "make dist" ship the FAQ. documentation changes . Document what features available to .sh jobs (Redmine #1558). diff --git a/Makefile.am b/Makefile.am index 3c50ad9..6e8d170 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # vi: noexpandtab softtabstop=0 ## Process this file with automake to produce Makefile.in -EXTRA_DIST = README COPYING AUTHORS INSTALL NEWS ChangeLog \ +EXTRA_DIST = FAQ README COPYING AUTHORS INSTALL NEWS ChangeLog \ backupninja.spec backupninja.spec.in autogen.sh SUBDIRS = etc examples handlers lib man src -- cgit v1.2.3 From 7e6a79c3d2fa908d76df5be9dd834e64f07f2481 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 15 May 2012 17:43:09 +0200 Subject: Install handlers as pkgdata_DATA, instead of their .in files. --- ChangeLog | 1 + handlers/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 0b2bf40..47dde53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ version 1.0 -- UNRELEASED to install such files anyway? . Have "make dist" ship handlers/*.in instead of make results. . Have "make dist" ship the FAQ. + . Install handlers as pkgdata_DATA, instead of their .in files. documentation changes . Document what features available to .sh jobs (Redmine #1558). diff --git a/handlers/Makefile.am b/handlers/Makefile.am index 6c1969b..bad53bb 100644 --- a/handlers/Makefile.am +++ b/handlers/Makefile.am @@ -16,7 +16,7 @@ edit = sed \ -e "s,@AWK\@,$(AWK),g" \ -e "s,@SED\@,$(SED),g" -dist_pkgdata_DATA = $(DIST_HANDLERS) +pkgdata_DATA = $(HANDLERS) dup: $(srcdir)/dup.in rm -f dup -- cgit v1.2.3 From d5a65fc0d683fcfd9ac87fd93c0c73edcdc09b40 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 15 May 2012 16:24:55 +0200 Subject: Releasing backupninja 1.0-rc1. --- ChangeLog | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 47dde53..209eacf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -version 1.0 -- UNRELEASED +version 1.0-rc1 -- May 15, 2012 handler changes dup: . Make the .dup generated by ninjahelper more consistent with diff --git a/configure.in b/configure.in index 2d30687..3cddf61 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ # The maintainer mode is causing me grief with newest versions of autotools #AM_MAINTAINER_MODE -AC_INIT([backupninja],[0.9.10],[backupninja@lists.riseup.net]) +AC_INIT([backupninja],[1.0-rc1],[backupninja@lists.riseup.net]) AC_CONFIG_SRCDIR([src/backupninja.in]) AM_INIT_AUTOMAKE -- cgit v1.2.3