From 79916c4c20af65063f280641f48d1f3c64a63171 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 27 Mar 2012 11:58:18 -0400 Subject: remove rsyncflags and excludes from maildir handler, they are not used anywhere --- handlers/maildir.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/handlers/maildir.in b/handlers/maildir.in index 912c0e6..64ac987 100644 --- a/handlers/maildir.in +++ b/handlers/maildir.in @@ -85,9 +85,6 @@ if [ $test ]; then testflags="--dry-run -v" fi -rsyncflags="$testflags -e 'ssh -p $destport -i $destid_file $sshoptions' -r -v --ignore-existing --delete --size-only --bwlimit=$speedlimit" -excludes="--exclude '.Trash/\*' --exclude '.Mistakes/\*' --exclude '.Spam/\*'" - ################################################################## ### FUNCTIONS -- cgit v1.2.3 From b05065625c76c271448f493f515558cbe00b34ac Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 20 May 2012 13:11:12 +0200 Subject: mysql: use --skip-events when backing up the performance_schema database (Closes: #673572) --- AUTHORS | 1 + ChangeLog | 6 ++++++ handlers/mysql.in | 13 +++++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1319688..4e7299b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -43,3 +43,4 @@ aihtdikh -- Allow 'when = XXX' with spaces in .sh files. Chris Lamb -- rdiff.helper bugfix Yuval Kogman -- RackSpace's CloudFiles support for duplicity exobuzz - mysql bugfixes +Glennie Vignarajah -- mysql bugfix diff --git a/ChangeLog b/ChangeLog index 209eacf..f2c9270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +version 1.0 -- UNRELEASED + handler changes + mysql: + . Use --skip-events when backing up the performance_schema database. + (Closes: #673572) + version 1.0-rc1 -- May 15, 2012 handler changes dup: diff --git a/handlers/mysql.in b/handlers/mysql.in index 65deebb..6ade49e 100644 --- a/handlers/mysql.in +++ b/handlers/mysql.in @@ -256,10 +256,15 @@ then for db in $databases do DUMP_BASE="$MYSQLDUMP $defaultsfile $sqldumpoptions" - if [ "$db" = "information_schema" ] || [ "$db" = "performance_schema" ] - then - DUMP_BASE="${DUMP_BASE} --skip-lock-tables" - fi + + case "$db" in + information_schema) + DUMP_BASE="${DUMP_BASE} --skip-lock-tables" + ;; + performance_schema) + DUMP_BASE="${DUMP_BASE} --skip-lock-tables --skip-events" + ;; + esac # Dumping structure and data DUMP="$DUMP_BASE $ignore $db" -- cgit v1.2.3 From 7af82be3ecf950fd19190d06fb9ad0f3f0aca97a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 11 Jun 2012 15:54:31 +0200 Subject: Make it clear what lockfile could not be acquired. --- ChangeLog | 2 ++ src/backupninja.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f2c9270..faf06dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ version 1.0 -- UNRELEASED mysql: . Use --skip-events when backing up the performance_schema database. (Closes: #673572) + backupninja changes + . Make it clear what lockfile could not be acquired, if any. version 1.0-rc1 -- May 15, 2012 handler changes diff --git a/src/backupninja.in b/src/backupninja.in index 0400828..0f74906 100755 --- a/src/backupninja.in +++ b/src/backupninja.in @@ -349,7 +349,7 @@ function process_action() { else # a backup is probably ongoing already, so display an error message - debug "failed to acquire lock" + debug "failed to acquire lock $lockfile" echo "Fatal: Could not acquire lock $lockfile. A backup is probably already running for $file." >>$bufferfile fi } 200> $lockfile -- cgit v1.2.3 From 1eabbe5de7f1b583ab4f0301646a2108122602b4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 11 Jun 2012 10:07:53 -0400 Subject: dont run lspci and modinfo when hwinfo==no --- ChangeLog | 2 ++ handlers/sys.in | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index faf06dd..f2e2b7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ version 1.0 -- UNRELEASED (Closes: #673572) backupninja changes . Make it clear what lockfile could not be acquired, if any. + sys: + . Don't execute /usr/bin/lspci or /sbin/modinfo when $hardware == "no" version 1.0-rc1 -- May 15, 2012 handler changes diff --git a/handlers/sys.in b/handlers/sys.in index 74133a3..92998cc 100644 --- a/handlers/sys.in +++ b/handlers/sys.in @@ -348,13 +348,15 @@ echo "Getting information about the kernel." echo STATUS="Getting kernel version:" catifexec "/bin/uname" "-a" -STATUS="Checking module information:" -catifexec "/sbin/lsmod" -for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Module 2>/dev/null -) ; do - STATUS="Checking module information $x:" - catifexec "/sbin/modinfo" "$x" -done +if [ "$hardware" == "yes" ]; then + STATUS="Checking module information:" + catifexec "/sbin/lsmod" + for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Module 2>/dev/null + ) ; do + STATUS="Checking module information $x:" + catifexec "/sbin/modinfo" "$x" + done +fi STATUS="Gathering information about your filesystems:" catiffile "/proc/filesystems" @@ -432,9 +434,11 @@ catiffile "/proc/rtc" STATUS="Gathering information about your ide drivers:" catiffile "/proc/ide" -STATUS="Gathering information about your bus:" -catifexec "/usr/bin/lspci" -catiffile "/proc/bus" +if [ "$hardware" == "yes" ]; then + STATUS="Gathering information about your bus:" + catifexec "/usr/bin/lspci" + catiffile "/proc/bus" +fi echo echo "Getting disk and filesystem information." -- cgit v1.2.3 From cd3abeab358e1a13bd6c14002b2feb5558b9a6a1 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 11 Jun 2012 10:22:08 -0400 Subject: add experimental dsync handler, heavily based on maildir handler --- handlers/dsync.in | 357 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 357 insertions(+) create mode 100644 handlers/dsync.in diff --git a/handlers/dsync.in b/handlers/dsync.in new file mode 100644 index 0000000..bf7b51d --- /dev/null +++ b/handlers/dsync.in @@ -0,0 +1,357 @@ +# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*- +# vim: set filetype=sh sw=3 sts=3 expandtab autoindent: + +############################################################### +# +# This handler uses dovecot (version 2 or later) dsync backup +# to backup mail to a remote server. +# +# Source and destination directories are typically configured +# via the dovecot configuration, but can be overridden using +# the settings here. +# +# if the configuration is setup to have keepdaily at 3, +# keepweekly is 2, and keepmonthly is 1, then each user's +# maildir backup snapshot directory will contain these files: +# daily.1 +# daily.2 +# daily.3 +# weekly.1 +# weekly.2 +# monthly.1 +# +# The basic algorithm is to dsync each user individually, +# and to use hard links for retaining historical data. +# +# For the backup rotation to work, destuser must be able to run +# arbitrary bash commands on the desthost. +# +# If 'remove' is set to 'yes' (default), then any mail directory +# which is deleted from the source will be moved to a "deleted" +# directory in the destination. It is up to you to periodically +# remove this directory or old maildirs in it. +# +# Limitations: +# . because we are not dynamically looking up anything with +# dovecot's userdb, we expect all data to be under the same +# tree on both the source and destination +# +# . we are assuming a backup to a backup server, so the +# destination host should have its dovecot mail_location +# configured to put the mail into +# $stripped_destdir/$letter/$user/$current_backup +# +############################################################## + +getconf rotate yes +getconf remove yes +getconf backup yes + +getconf keepdaily 5 +getconf keepweekly 3 +getconf keepmonthly 1 + +getconf srcconffile +getconf destconffile +getconf srcdir +getconf destdir +getconf current_backup current_backup +getconf desthost +getconf destport 22 +getconf destuser +getconf destid_file /root/.ssh/id_rsa +getconf sshoptions + +failedcount=0 + +# strip leading mailbox specifier (eg. mdbox:; maildir:, etc) +stripped_destdir=${destdir/*:/} +stripped_srcdir=${srcdir/*:/} + +# strip trailing / +destdir=${destdir%/} +srcdir=${srcdir%/} + +if [ ! -n $destdir ]; then + destdir='-o mail_location=$destdir' +fi +if [ ! -n $srcdir ]; then + srcdir='-o mail_location=$srcdir' +fi + +if [ ! -n $srcconffile ]; then + srcconffile='-c $srcconffile' +fi + +if [ ! -n $destconffile ]; then + destconffile='-c $destconffile' +fi + +[ -d $stripped_srcdir ] || fatal "source directory $srcdir doesn't exist" + + +################################################################## +### FUNCTIONS + +function do_user() { + local user=$1 + local btype=$2 + local letter=${user:0:1} + local target="$stripped_destdir/$letter/$user/$current_backup" + + debug "syncing" + while [ $failedcount -lt 4 ]; do + debug $DSYNC $testflags -u $user backup $srcconffile $srcdir \ + ssh -i $destid_file $destuser@$desthost $DSYNC $destconffile \ + -u $user $destdir 2>&1 + ret=`$DSYNC $testflags -u $user backup $srcconffile $srcdir \ + ssh -i $destid_file $destuser@$desthost $DSYNC $destconffile \ + -u $user $destdir 2>&1` + ret=$? + if [ $ret == 2 ]; then + # dsync needs to be run again + let "failedcount = failedcount + 1" + elif [ $ret == 0 ]; then + # things worked, so we break out of the loop + let "failedcount = 4" + # move the directory to the $btype.1 and make a 'created' file + ssh -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file $sshoptions "mv $target ../$btype.1" + ssh -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file $sshoptions "date +%c%n%s > ../$btype.1/created" + elif [ $ret != 0 ]; then + # things did not work in a good way, report it and try again + warning "dsync $user failed" + warning " returned: $ret" + let "failedcount = failedcount + 1" + fi + + if [ $failedcount -gt 4 ]; then + fatal "dsync failed 3 times for this user -- something is not working right. bailing out." + fi + done +} + +# remove any maildirs from backup which might have been deleted +# and add new ones which have just been created. +# (actually, it just moved them to the directory "deleted") + +function do_remove() { + local tmp1=`maketemp dsync-tmp-file` + local tmp2=`maketemp dsync-tmp-file` + + ssh -p $destport -i $destid_file $sshoptions $destuser@$desthost mkdir -p "${stripped_destdir}/deleted" + cd "$stripped_srcdir" + for userdir in `ls -d1 */`; do + ls -1 "$stripped_srcdir/$userdir" | sort > $tmp1 + ssh -p $destport -i $destid_file $sshoptions $destuser@$desthost ls -1 "$stripped_destdir/$userdir" | sort > $tmp2 + for deluser in `join -v 2 $tmp1 $tmp2`; do + [ "$deluser" != "" ] || continue + info "removing $destuser@$desthost:$stripped_destdir/$userdir$deluser/" + ssh -p $destport -i $destid_file $sshoptions $destuser@$desthost mv "$stripped_destdir/$userdir$deluser/" "$stripped_destdir/deleted" + ssh -p $destport -i $destid_file $sshoptions $destuser@$desthost "date +%c%n%s > '$stripped_destdir/deleted/$deluser/deleted_on'" + done + done + rm $tmp1 + rm $tmp2 +} + +function do_rotate() { + [ "$rotate" == "yes" ] || return; + local user=$1 + local letter=${user:0:1} + local backuproot="$stripped_destdir/$letter/$user" + local target="$stripped_destdir/$letter/$user/$current_backup" +( + ssh -T -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file $sshoptions < 0; i-- )); do + if [ -d \$dir.\$i ]; then + if [ -f \$dir.\$i/created ]; then + created=\`tail -1 \$dir.\$i/created\` + else + created=0 + fi + cutoff_time=\$(( now - (seconds*(i-1)) )) + if [ ! \$created -gt \$cutoff_time ]; then + next=\$(( i + 1 )) + if [ ! -d \$dir.\$next ]; then + echo "Debug: \$rottype.\$i --> \$rottype.\$next" + mv \$dir.\$i \$dir.\$next + date +%c%n%s > \$dir.\$next/rotated + else + echo "Debug: skipping rotation of \$dir.\$i because \$dir.\$next already exists." + fi + else + echo "Debug: skipping rotation of \$dir.\$i because it was created" \$(( (now-created)/86400)) "days ago ("\$(( (now-cutoff_time)/86400))" needed)." + fi + fi + done + done + + max=\$((keepdaily+1)) + if [ \( \$keepweekly -gt 0 -a -d $backuproot/daily.\$max \) -a ! -d $backuproot/weekly.1 ]; then + echo "Debug: daily.\$max --> weekly.1" + mv $backuproot/daily.\$max $backuproot/weekly.1 + date +%c%n%s > $backuproot/weekly.1/rotated + fi + + max=\$((keepweekly+1)) + if [ \( \$keepmonthly -gt 0 -a -d $backuproot/weekly.\$max \) -a ! -d $backuproot/monthly.1 ]; then + echo "Debug: weekly.\$max --> monthly.1" + mv $backuproot/weekly.\$max $backuproot/monthly.1 + date +%c%n%s > $backuproot/monthly.1/rotated + fi + + for rottype in daily weekly monthly; do + max=\$((keep\${rottype}+1)) + dir="$backuproot/\$rottype" + oldest=\`find $backuproot -maxdepth 1 -type d -name \$rottype'.*' | @SED@ 's/^.*\.//' | sort -n | tail -1\` + [ "\$oldest" == "" ] && oldest=0 + # if we've rotated the last backup off the stack, remove it. + for (( i=\$oldest; i >= \$max; i-- )); do + if [ -d \$dir.\$i ]; then + if [ -d $backuproot/rotate.tmp ]; then + echo "Debug: removing rotate.tmp" + rm -rf $backuproot/rotate.tmp + fi + echo "Debug: moving \$rottype.\$i to rotate.tmp" + mv \$dir.\$i $backuproot/rotate.tmp + fi + done + done +####### END REMOTE SCRIPT ####### +EOF +) | (while read a; do passthru $a; done) + +} + + +function setup_remote_dirs() { + local user=$1 + local backuptype=$2 + local letter=${user:0:1} + local dir="$stripped_destdir/$letter/$user/$backuptype" + local tmpdir="$stripped_destdir/$letter/$user/rotate.tmp" +( + ssh -T -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file $sshoptions < $backuptype.1" + cp -alf $dir.2/. $dir.1 + #if [ \$? == 1 ]; then + # echo "Fatal: could not create hard links to $dir.1 on host $desthost" + # exit 1 + #fi + fi + fi + [ -f $dir.1/created ] && rm $dir.1/created + [ -f $dir.1/rotated ] && rm $dir.1/rotated + exit 0 +EOF +) | (while read a; do passthru $a; done) + + if [ $? == 1 ]; then exit; fi +} + +### +################################################################## + +# see if we can login +debug "ssh -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file $sshoptions 'echo -n 1'" +if [ ! $test ]; then + result=`ssh -o PasswordAuthentication=no $desthost -l $destuser -i $destid_file $sshoptions 'echo -n 1' 2>&1` + if [ "$result" != "1" ]; then + fatal "Can't connect to $desthost as $destuser using $destid_file." + fi +fi + +## SANITY CHECKS ## +status=`ssh -p $destport -i $destid_file $sshoptions $destuser@$desthost "[ -d \"$stripped_destdir\" ] && echo 'ok'"` +if [ "$status" != "ok" ]; then + fatal "Destination directory $stripped_destdir doesn't exist!" + exit +fi + +### REMOVE OLD MAILDIRS ### + +if [ "$remove" == "yes" ]; then + do_remove +fi + +### MAKE BACKUPS ### + +if [ "$backup" == "yes" ]; then + if [ $keepdaily -gt 0 ]; then btype=daily + elif [ $keepweekly -gt 0 ]; then btype=weekly + elif [ $keepmonthly -gt 0 ]; then btype=monthly + else fatal "keeping no backups"; fi + + if [ "$testuser" != "" ]; then + cd "$stripped_srcdir/${user:0:1}" + do_rotate $testuser + setup_remote_dirs $testuser $btype + do_user $testuser $btype + else + [ -d "$stripped_srcdir" ] || fatal "directory $stripped_srcdir not found." + for user in `$DOVEADM user \* | cut -d@ -f1` + do + debug $user + [ "$user" != "" ] || continue + do_rotate $user + setup_remote_dirs $user $btype + do_user $user $btype + done + fi +fi + -- cgit v1.2.3 From f7488968c0ab80b923927cc8bf6376fd28fd5022 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 15 Jun 2012 20:21:09 +0200 Subject: rsync: generate excludes command-line snippet the same way as the duplicity handler does. The latter has a robust history wrt. dealing with excludes / glob / quoting etc., let's use that instead of the shiny new sed-based way. --- handlers/rsync.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/handlers/rsync.in b/handlers/rsync.in index 386255e..c584e7f 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -275,8 +275,15 @@ function eval_config { mv=move_files fi - excludes=`echo "$exclude" | @SED@ -e "s/^/--exclude='/g" -e "s/ /' --exclude='/g" -e "s/$/'/"` - + set -o noglob + SAVEIFS=$IFS + IFS=$(echo -en "\n\b") + for i in $exclude; do + str="${i//__star__/*}" + excludes="${excludes} --exclude='$str'" + done + IFS=$SAVEIFS + set +o noglob } function rotate_short { -- cgit v1.2.3 From 1b48bc44445cba33a748bb8ad2833d7e2187d1ad Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 15 Jun 2012 20:27:01 +0200 Subject: rsync: stop passing $excludes as a single argument. --- handlers/rsync.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handlers/rsync.in b/handlers/rsync.in index c584e7f..2620c47 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -1116,7 +1116,7 @@ for SECTION in $include; do set_dest info "Syncing $SECTION on $dest_path..." - debug $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path + debug $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path set_pipefail $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path | tee -a $log -- cgit v1.2.3 From 29dcdbae919787978fafd41a12d48338958e92f9 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 15 Jun 2012 20:27:31 +0200 Subject: Run rsync command-line through a shell, so that single-quotes around excludes are interpreted (Closes: #677410) When --exclude 'something' is passed directly to rsync without going through a shell, rsync tries to match a file whose name contains single quotes, which is definitely not what we want it to do: exclude arguments protected with single quotes are meant to be passed to a shell. --- handlers/rsync.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handlers/rsync.in b/handlers/rsync.in index 2620c47..f0df52f 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -1116,9 +1116,9 @@ for SECTION in $include; do set_dest info "Syncing $SECTION on $dest_path..." - debug $nice $rsync "${rsync_options[@]}" $filelist_flag $excludes $batch_option $orig $dest_path + debug $nice $rsync ${rsync_options[@]} $filelist_flag $excludes $batch_option $orig $dest_path set_pipefail - $nice $rsync "${rsync_options[@]}" $filelist_flag "$excludes" $batch_option $orig $dest_path | tee -a $log + $nice su -c "$rsync ${rsync_options[@]} --delete-excluded $filelist_flag $excludes $batch_option $orig $dest_path" | tee -a $log if [ "$?" != "0" ]; then fatal "Rsync error when trying to transfer $SECTION" -- cgit v1.2.3 From 7d4ef67e2202fb80c341f1dee80baf8d69aa55fc Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 15 Jun 2012 20:35:04 +0200 Subject: Update and fix ChangeLog. --- ChangeLog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2e2b7c..f8c9a03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,10 +3,15 @@ version 1.0 -- UNRELEASED mysql: . Use --skip-events when backing up the performance_schema database. (Closes: #673572) - backupninja changes - . Make it clear what lockfile could not be acquired, if any. + rsync: + . Generate excludes command-line snippet the same way as + the duplicity handler does. + . Run rsync command-line through a shell, so that single-quotes + around excludes are interpreted (Closes: #677410) sys: . Don't execute /usr/bin/lspci or /sbin/modinfo when $hardware == "no" + backupninja changes + . Make it clear what lockfile could not be acquired, if any. version 1.0-rc1 -- May 15, 2012 handler changes -- cgit v1.2.3 From aae966981e259b11afc1e01b68d4fa7c59cde646 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 15 Jun 2012 20:35:12 +0200 Subject: Releasing backupninja 1.0. (Happy birthdays!) --- ChangeLog | 3 ++- configure.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8c9a03..179d52f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ -version 1.0 -- UNRELEASED +version 1.0 -- June 15, 2012 + The "happy birthdays" release! handler changes mysql: . Use --skip-events when backing up the performance_schema database. diff --git a/configure.in b/configure.in index 3cddf61..dcb8c24 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],[1.0-rc1],[backupninja@lists.riseup.net]) +AC_INIT([backupninja],[1.0],[backupninja@lists.riseup.net]) AC_CONFIG_SRCDIR([src/backupninja.in]) AM_INIT_AUTOMAKE -- cgit v1.2.3