X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fbackupninja.in;h=3bf0ad161e4ab7896d2ad6f504d7c48bd7787c42;hb=4ce9c573c8533d3b2f1ec6063342fadd06356540;hp=57936da1d4b2ce5a521dcbdae05c3ee7ed218aa7;hpb=489e294c50b6cba7545a110d26edd43e6b6e55ea;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/src/backupninja.in b/src/backupninja.in index 57936da..3bf0ad1 100755 --- a/src/backupninja.in +++ b/src/backupninja.in @@ -132,7 +132,7 @@ function msg { function check_perms() { local file=$1 local perms - perms=($(stat -L --printf='%a %g %G %u %U' $file)) + perms=($(stat -L --format='%a %g %G %u %U' $file)) local gperm=${perms[0]:1:1} local wperm=${perms[0]:2:1} local gid=${perms[1]} @@ -426,6 +426,7 @@ setfile $conffile getconf configdirectory @CFGDIR@/backup.d getconf scriptdirectory @datadir@ getconf reportemail +getconf reportspace getconf reportsuccess yes getconf reportwarning yes getconf loglevel 3 @@ -476,7 +477,11 @@ errormsg="" if [ "$singlerun" ]; then files=$singlerun else - files=`find $configdirectory -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n` + files=`find $configdirectory -follow -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n` + + if [ -z "$files" ]; then + fatal "No backup actions configured in '$configdirectory', run ninjahelper!" + fi fi for file in $files; do @@ -522,7 +527,18 @@ if [ $doit == 1 ]; then echo ${messages[$i]} done echo -e "$errormsg" - } | mail $reportemail -s "backupninja: $hostname $subject" + if [ "$reportspace" == "yes" ]; then + previous="" + for i in $(ls "$configdirectory"); do + backuploc=$(grep ^directory "$configdirectory"/"$i" | awk '{print $3}') + if [ "$backuploc" != "$previous" ]; then + mountdev=$(mount | grep "$backuploc" | awk '{print $1}') + df -h "$mountdev" + previous="$backuploc" + fi + done + fi + } | mail -s "backupninja: $hostname $subject" $reportemail fi if [ $actions_run != 0 ]; then