From 4ce9c573c8533d3b2f1ec6063342fadd06356540 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 6 Oct 2006 18:42:32 +0000
Subject: [PATCH] Added disk space report option (adam kosmin suggestion)
removed sys vserver not running noise report (anarcat suggestion)
---
ChangeLog | 6 ++++--
etc/backupninja.conf.in | 4 ++++
handlers/sys | 1 -
src/backupninja.in | 12 ++++++++++++
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index db0931d..a0e21f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ version 0.9.4 -- unreleased
. Changed order of -s to mail for compatibility
. fixed permission stat call so it uses the --format supported by
coreutils (Closes: #382747)
+ . Added disk space report option (thanks Adam Kosmin)
handler changes
Added tar handler:
. create tarballs
@@ -61,9 +62,10 @@ version 0.9.4 -- unreleased
0.4.3 will integrate them)
. Now forbid to (try to) include /.
sys:
- . Many more system checks were added, thanks to Petr Kl�ma
+ . Many more system checks were added, (thanks to Petr Kl�ma)
. Added warning if no devices were found (thanks Ranier Zocholl)
- . Enhanced debian package selections to include purged packages (Thanks Tom Hoover)
+ . Enhanced debian package selections to include purged packages (thanks Tom Hoover)
+ . Removed warning about vserver not running (thanks anarcat)
ldap:
. Compress now happens in-line to save some disk space (Closes: #370778)
makecd:
diff --git a/etc/backupninja.conf.in b/etc/backupninja.conf.in
index f749e2a..951a8ca 100644
--- a/etc/backupninja.conf.in
+++ b/etc/backupninja.conf.in
@@ -25,6 +25,10 @@ reportsuccess = yes
# even if there was no error. (default = yes)
reportwarning = yes
+# if set to 'yes', disk space usage will be included in
+# the backup email report
+reportspace = no
+
# set to the administration group that is allowed to
# read/write configuration files in /etc/backup.d
admingroup = root
diff --git a/handlers/sys b/handlers/sys
index 3c04365..8059866 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -93,7 +93,6 @@ if [ "$packages" == "yes" ]; then
nodpkg="$nodpkg|$vserver"
fi
else
- warning "vserver $vserver is not running, skipping installed packages report."
nodpkg="$nodpkg|$vserver"
fi
diff --git a/src/backupninja.in b/src/backupninja.in
index 114d66c..3bf0ad1 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -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
@@ -526,6 +527,17 @@ if [ $doit == 1 ]; then
echo ${messages[$i]}
done
echo -e "$errormsg"
+ 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
--
GitLab