X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fbackupninja.in;h=f0622bd1272a6cf2294beb5a2413b25a79ef7fa9;hb=c836982f43d67d19cceb6c727675fbbc22ae7981;hp=9330902e0bfcd97721deb29011e8ffa73972315b;hpb=c8efb40b7febbdd2aee03996938e6d8c63c06377;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/src/backupninja.in b/src/backupninja.in
index 9330902..f0622bd 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -130,17 +130,37 @@ function msg {
 #
 
 function check_perms() {
-	local file=$1
-	local perms=`ls -ld $file`
-	perms=${perms:4:6}
-	if [ "$perms" != "------" ]; then
-		echo "Configuration files must not be group or world writable/readable! Dying on file $file"
-		fatal "Configuration files must not be group or world writable/readable! Dying on file $file"
-	fi
-	if [ `ls -ld $file | awk '{print $3}'` != "root" ]; then
-		echo "Configuration files must be owned by root! Dying on file $file"
-		fatal "Configuration files must be owned by root! Dying on file $file"
-	fi
+   local file=$1
+   local perms
+   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]}
+   local group=${perms[2]}
+   local owner=${perms[3]}
+
+   if [ "$owner" != 0 ]; then
+      echo "Configuration files must be owned by root! Dying on file $file"
+      fatal "Configuration files must be owned by root! Dying on file $file"
+   fi
+   
+   if [ $wperm -gt 0 ]; then
+      echo "Configuration files must not be world writable/readable! Dying on file $file"
+      fatal "Configuration files must not be world writable/readable! Dying on file $file"
+   fi
+
+   if [ $gperm -gt 0 ]; then
+      case "$admingroup" in
+         $gid|$group) :;;
+
+         *)
+           if [ "$gid" != 0 ]; then
+              echo "Configuration files must not be writable/readable by group ${perms[2]}! Dying on file $file"
+              fatal "Configuration files must not be writable/readable by group ${perms[2]}! Dying on file $file"
+           fi
+         ;;
+         esac
+   fi
 }
 
 # simple lowercase function
@@ -398,6 +418,7 @@ fi
 
 # include shared functions
 . $libdirectory/tools
+. $libdirectory/vserver
 
 setfile $conffile
 
@@ -405,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
@@ -422,10 +444,11 @@ getconf PGSQLDUMP /usr/bin/pg_dump
 getconf PGSQLDUMPALL /usr/bin/pg_dumpall
 getconf GZIP /bin/gzip
 getconf RSYNC /usr/bin/rsync
-getconf vservers no
-getconf VSERVERINFO /usr/sbin/vserver-info
-getconf VSERVER /usr/sbin/vserver
-getconf VROOTDIR `if [ -f "$VSERVERINFO" ]; then $VSERVERINFO info SYSINFO |grep vserver-Rootdir | awk '{print $2}'; fi`
+getconf admingroup root
+
+# initialize vservers support
+# (get config variables and check real vservers availability)
+init_vservers nodialog
 
 if [ ! -d "$configdirectory" ]; then
 	echo "Configuration directory '$configdirectory' not found."
@@ -439,11 +462,6 @@ if [ "$UID" != "0" ]; then
 	exit 1
 fi
 
-if [ "$vservers" == "yes" -a ! -d "$VROOTDIR" ]; then
-	echo "vservers option set in config, but $VROOTDIR is not a directory!"
-	fatal "vservers option set in config, but $VROOTDIR is not a directory!"
-fi
-
 ## Process each configuration file
 
 # by default, don't make files which are world or group readable.
@@ -459,12 +477,17 @@ errormsg=""
 if [ "$singlerun" ]; then
 	files=$singlerun
 else
-	files=`find $configdirectory -mindepth 1 ! -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
 	[ -f "$file" ] || continue
 
+        check_perms ${file%/*} # check containing dir
 	check_perms $file
 	suffix="${file##*.}"
 	base=`basename $file`
@@ -504,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