Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-08 20:02:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added disk space report option (adam kosmin suggestion)

Browse Source 
removed sys vserver not running noise report (anarcat suggestion)
This commit is contained in:
Micah Anderson 2006-10-06 18:42:32 +00:00
parent 4ceb4f15c2
commit 4ce9c573c8
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -13,6 +13,7 @@ version 0.9.4 -- unreleased
. Changed order of -s to mail for compatibility . Changed order of -s to mail for compatibility
. fixed permission stat call so it uses the --format supported by . fixed permission stat call so it uses the --format supported by
coreutils (Closes: #382747) coreutils (Closes: #382747)
. Added disk space report option (thanks Adam Kosmin)
handler changes handler changes
Added tar handler: Added tar handler:
. create tarballs . create tarballs
@ -61,9 +62,10 @@ version 0.9.4 -- unreleased
0.4.3 will integrate them) 0.4.3 will integrate them)
. Now forbid to (try to) include /. . Now forbid to (try to) include /.
sys: 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) . 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: ldap:
. Compress now happens in-line to save some disk space (Closes: #370778) . Compress now happens in-line to save some disk space (Closes: #370778)
makecd: makecd:

4
etc/backupninja.conf.in
View File

@ -25,6 +25,10 @@ reportsuccess = yes
# even if there was no error. (default = yes) # even if there was no error. (default = yes)
reportwarning = 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 # set to the administration group that is allowed to
# read/write configuration files in /etc/backup.d # read/write configuration files in /etc/backup.d
admingroup = root admingroup = root

1
handlers/sys
View File

@ -93,7 +93,6 @@ if [ "$packages" == "yes" ]; then
nodpkg="$nodpkg|$vserver" nodpkg="$nodpkg|$vserver"
fi fi
else else
warning "vserver $vserver is not running, skipping installed packages report."
nodpkg="$nodpkg|$vserver" nodpkg="$nodpkg|$vserver"
fi fi

12
src/backupninja.in
View File

@ -426,6 +426,7 @@ setfile $conffile
getconf configdirectory @CFGDIR@/backup.d getconf configdirectory @CFGDIR@/backup.d
getconf scriptdirectory @datadir@ getconf scriptdirectory @datadir@
getconf reportemail getconf reportemail
getconf reportspace
getconf reportsuccess yes getconf reportsuccess yes
getconf reportwarning yes getconf reportwarning yes
getconf loglevel 3 getconf loglevel 3
@ -526,6 +527,17 @@ if [ $doit == 1 ]; then
echo ${messages[$i]} echo ${messages[$i]}
done done
echo -e "$errormsg" 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 } | mail -s "backupninja: $hostname $subject" $reportemail
fi fi