fix cstream definition

[matthijs/upstream/backupninja.git] / src / backupninja.in

diff --git a/src/backupninja.in b/src/backupninja.in
index 02ffa25b519fc5cd7f860cd580b3c5ca8918169e..7fa6fb11e0b180a95ede816c1178075afa71d1e3 100755 (executable)
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -178,7 +178,7 @@ function tolower() {
 
 # simple to integer function
 function toint() {
-       echo "$1" | tr -d [:alpha:] 
+       echo "$1" | tr -d '[:alpha:]'
 }
 
 #
@@ -433,9 +433,12 @@ setfile $conffile
 # get global config options (second param is the default)
 getconf configdirectory @CFGDIR@/backup.d
 getconf scriptdirectory @datadir@
+getconf reportdirectory
 getconf reportemail
+getconf reporthost
 getconf reportspace
 getconf reportsuccess yes
+getconf reportuser
 getconf reportwarning yes
 getconf loglevel 3
 getconf when "Everyday at 01:00"
@@ -445,7 +448,7 @@ getconf usecolors "yes"
 getconf SLAPCAT /usr/sbin/slapcat
 getconf LDAPSEARCH /usr/bin/ldapsearch
 getconf RDIFFBACKUP /usr/bin/rdiff-backup
-getconf CSTREAM=/usr/bin/cstream
+getconf CSTREAM /usr/bin/cstream
 getconf MYSQLADMIN /usr/bin/mysqladmin
 getconf MYSQL /usr/bin/mysql
 getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
@@ -543,10 +546,9 @@ if [ $doit == 1 ]; then
                        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"
+                               df -h "$backuploc"
                                previous="$backuploc"
-                               fi
+                       fi
                        done
                fi
        } | mail -s "backupninja: $hostname $subject" $reportemail
@@ -555,3 +557,8 @@ fi
 if [ $actions_run != 0 ]; then
        info "FINISHED: $actions_run actions run. $fatals fatal. $errors error. $warnings warning."
 fi
+
+if [ -n "$reporthost" ]; then
+       debug "send $logfile to $reportuser@$reporthost:$reportdirectory"
+       rsync -qt $logfile $reportuser@$reporthost:$reportdirectory
+fi