X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=src%2Fbackupninja.in;h=7fa6fb11e0b180a95ede816c1178075afa71d1e3;hp=920d89e66f3fdc244c95c30d2b07ba8d51278ce5;hb=cfca25c390f33b5c0cfc4f63166f446a556c1b6a;hpb=5eef842c2b297ded85d4f9e312f806f9c61153fb

diff --git a/src/backupninja.in b/src/backupninja.in
index 920d89e..7fa6fb1 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -34,7 +34,7 @@ function setupcolors () {
 
 function colorize () {
 	if [ "$usecolors" == "yes" ]; then
-		local typestr=`echo "$@" | sed 's/\(^[^:]*\).*$/\1/'`
+		local typestr=`echo "$@" | @SED@ 's/\(^[^:]*\).*$/\1/'`
 		[ "$typestr" == "Debug" ] && type=0
 		[ "$typestr" == "Info" ] && type=1
 		[ "$typestr" == "Warning" ] && type=2
@@ -68,7 +68,7 @@ function printmsg() {
 	type=$1
 	shift
 	if [ $type == 100 ]; then
-		typestr=`echo "$@" | sed 's/\(^[^:]*\).*$/\1/'`
+		typestr=`echo "$@" | @SED@ 's/\(^[^:]*\).*$/\1/'`
 		[ "$typestr" == "Debug" ] && type=0
 		[ "$typestr" == "Info" ] && type=1
 		[ "$typestr" == "Warning" ] && type=2
@@ -178,7 +178,7 @@ function tolower() {
 
 # simple to integer function
 function toint() {
-	echo "$1" | tr -d [:alpha:] 
+	echo "$1" | tr -d '[:alpha:]'
 }
 
 #
@@ -204,7 +204,7 @@ function isnow() {
 	whendayofweek=$1; at=$2; whentime=$3;
 	whenday=`toint "$whendayofweek"`
 	whendayofweek=`tolower "$whendayofweek"`
-	whentime=`echo "$whentime" | sed 's/:[0-9][0-9]$//' | sed -r 's/^([0-9])$/0\1/'`
+	whentime=`echo "$whentime" | @SED@ 's/:[0-9][0-9]$//' | @SED@ -r 's/^([0-9])$/0\1/'`
 
 	if [ "$whendayofweek" == "everyday" -o "$whendayofweek" == "daily" ]; then
 		whendayofweek=$nowdayofweek
@@ -409,7 +409,7 @@ if [ ! -r "$conffile" ]; then
 fi
 
 # find $libdirectory
-libdirectory=`grep '^libdirectory' $conffile | awk '{print $3}'`
+libdirectory=`grep '^libdirectory' $conffile | @AWK@ '{print $3}'`
 if [ -z "$libdirectory" ]; then
         if [ -d "@libdir@" ]; then
 	   libdirectory="@libdir@"
@@ -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,11 +448,14 @@ 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 MYSQLADMIN /usr/bin/mysqladmin
 getconf MYSQL /usr/bin/mysql
 getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
 getconf MYSQLDUMP /usr/bin/mysqldump
 getconf PGSQLDUMP /usr/bin/pg_dump
 getconf PGSQLDUMPALL /usr/bin/pg_dumpall
+getconf PGSQLUSER postgres
 getconf GZIP /bin/gzip
 getconf RSYNC /usr/bin/rsync
 getconf admingroup root
@@ -538,12 +544,11 @@ if [ $doit == 1 ]; then
 		if [ "$reportspace" == "yes" ]; then
 			previous=""
 			for i in $(ls "$configdirectory"); do
-			backuploc=$(grep ^directory "$configdirectory"/"$i" | awk '{print $3}')
+			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
@@ -552,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