X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=src%2Fbackupninja.in;h=fb6cc16e39eea4d4f917662bff30f5b63017c41f;hp=8f7bd03f39542a1e537cb4e13fcb4850978e5a22;hb=c22ad121d9d8b11650b265863c783d9f12c92385;hpb=5d63983704cf68acc3f6d0fe9b2e9c836078ec2c

diff --git a/src/backupninja.in b/src/backupninja.in
index 8f7bd03..fb6cc16 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -1,4 +1,6 @@
 #!@BASH@
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
+#
 #                          |\_
 # B A C K U P N I N J A   /()/
 #                         `\|
@@ -19,7 +21,7 @@
 #####################################################
 ## FUNCTIONS
 
-setupcolors () {
+function setupcolors () {
 	BLUE="\033[34;01m"
 	GREEN="\033[32;01m"
 	YELLOW="\033[33;01m"
@@ -27,18 +29,20 @@ setupcolors () {
 	RED="\033[31;01m"
 	OFF="\033[0m"
 	CYAN="\033[36;01m"
+	COLORS=($BLUE $GREEN $YELLOW $RED $PURPLE)
 }
 
-colorize () {
+function colorize () {
 	if [ "$usecolors" == "yes" ]; then
 		local typestr=`echo "$@" | sed 's/\(^[^:]*\).*$/\1/'`
-		[ "$typestr" == "Debug" ] && COLOR=$BLUE
-		[ "$typestr" == "Info" ] && COLOR=$GREEN
-		[ "$typestr" == "Warning" ] && COLOR=$YELLOW
-		[ "$typestr" == "Error" ] && COLOR=$RED
-		[ "$typestr" == "Fatal" ] && COLOR=$PURPLE
+		[ "$typestr" == "Debug" ] && type=0
+		[ "$typestr" == "Info" ] && type=1
+		[ "$typestr" == "Warning" ] && type=2
+		[ "$typestr" == "Error" ] && type=3
+		[ "$typestr" == "Fatal" ] && type=4
+		color=${COLORS[$type]}
 		endcolor=$OFF
-		echo -e "$COLOR$@$endcolor"
+		echo -e "$color$@$endcolor"
 	else
 		echo -e "$@"
 	fi
@@ -121,70 +125,42 @@ function msg {
 	let "msgcount += 1"
 }
 
-function setfile() {
-	CURRENT_CONF_FILE=$1
-}
-
-function setsection() {
-	CURRENT_SECTION=$1
-}
-
-
-#
-# create a temporary file in a secure way.
-#
-function maketemp() {
-	if [ -x /bin/mktemp ]
-	then
-		local tempfile=`mktemp /tmp/$1.XXXXXXXX`
-	else
-		DATE=`date`
-		sectmp=`echo $DATE | /usr/bin/md5sum | cut -d- -f1`
-		local tempfile=/tmp/$1.$sectmp
-	fi
-	echo $tempfile
-}
-
-
-#
-# sets a global var with name equal to $1
-# to the value of the configuration parameter $1
-# $2 is the default.
-# 
-
-function getconf() {
-	CURRENT_PARAM=$1
-	ret=`awk -f $scriptdir/parseini S=$CURRENT_SECTION P=$CURRENT_PARAM $CURRENT_CONF_FILE`
-	# if nothing is returned, set the default
-	if [ "$ret" == "" -a "$2" != "" ]; then
-		ret="$2"
-	fi
-
-	# replace * with %, so that it is not globbed.
-	ret="${ret//\\*/__star__}"
-
-	# this is weird, but single quotes are needed to 
-	# allow for returned values with spaces. $ret is still expanded
-	# because it is in an 'eval' statement.
-	eval $1='$ret'
-}
-
 #
 # enforces very strict permissions on configuration file $file.
 #
 
 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 --printf='%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 writable/readable by group ${perms[2]}! Dying on file $file"
+              fatal "Configuration files must writable/readable by group ${perms[2]}! Dying on file $file"
+           fi
+         ;;
+         esac
+   fi
 }
 
 # simple lowercase function
@@ -194,7 +170,7 @@ function tolower() {
 
 # simple to integer function
 function toint() {
-	echo "$1" | tr [:alpha:] -d 
+	echo "$1" | tr -d [:alpha:] 
 }
 
 #
@@ -324,7 +300,7 @@ function process_action() {
 	echo "" > $bufferfile
 	echo_debug_msg=1
 	(
-		. $scriptdir/$suffix $file
+		. $scriptdirectory/$suffix $file
 	) 2>&1 | (
 		while read a; do
 			echo $a >> $bufferfile
@@ -424,42 +400,31 @@ if [ ! -r "$conffile" ]; then
 	fatal "Configuration file $conffile not found."
 fi
 
-# find $scriptdir
-scriptdir=`grep scriptdirectory $conffile | awk '{print $3}'`
-if [ -z "$scriptdir" ]; then
-        if [ -d "@datadir@" ]; then
-	   scriptdir="@datadir@"
-	else
-	   echo "Could not find entry 'scriptdirectory' in $conffile" 
-	   fatal "Could not find entry 'scriptdirectory' in $conffile" 
-	fi
-else
-        if [ ! -d "$scriptdir" ]; then
-	   echo "Script directory $scriptdir not found."
-	   fatal "Script directory $scriptdir not found."
-	fi	   
-fi
-
-# find $libdir
-libdir=`grep libdirectory $conffile | awk '{print $3}'`
-if [ -z "$libdir" ]; then
+# find $libdirectory
+libdirectory=`grep '^libdirectory' $conffile | awk '{print $3}'`
+if [ -z "$libdirectory" ]; then
         if [ -d "@libdir@" ]; then
-	   libdir="@libdir@"
+	   libdirectory="@libdir@"
 	else
 	   echo "Could not find entry 'libdirectory' in $conffile." 
 	   fatal "Could not find entry 'libdirectory' in $conffile." 
 	fi
 else
-        if [ ! -d "$libdir" ]; then
-	   echo "Lib directory $libdir not found." 
-	   fatal "Lib directory $libdir not found." 
+        if [ ! -d "$libdirectory" ]; then
+	   echo "Lib directory $libdirectory not found." 
+	   fatal "Lib directory $libdirectory not found." 
 	fi
 fi
 
+# include shared functions
+. $libdirectory/tools
+. $libdirectory/vserver
+
 setfile $conffile
 
 # get global config options (second param is the default)
 getconf configdirectory @CFGDIR@/backup.d
+getconf scriptdirectory @datadir@
 getconf reportemail
 getconf reportsuccess yes
 getconf reportwarning yes
@@ -478,10 +443,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."
@@ -491,15 +457,10 @@ fi
 [ -f "$logfile" ] || touch $logfile
 
 if [ "$UID" != "0" ]; then
-	echo "$0 can only be run as root"
+	echo "`basename $0` can only be run as root"
 	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.
@@ -515,12 +476,17 @@ errormsg=""
 if [ "$singlerun" ]; then
 	files=$singlerun
 else
-	files=`find $configdirectory -mindepth 1 ! -name '.*.swp' | sort -n`
+	files=`find -L $configdirectory -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`
@@ -529,7 +495,7 @@ for file in $files; do
 		continue
 	fi
 
-	if [ -e "$scriptdir/$suffix" ]; then
+	if [ -e "$scriptdirectory/$suffix" ]; then
 		process_action $file $suffix
 	else
 		error "Can't process file '$file': no handler script for suffix '$suffix'"
@@ -560,7 +526,7 @@ if [ $doit == 1 ]; then
 	 		echo ${messages[$i]}
 		done
 		echo -e "$errormsg"
-	} | mail $reportemail -s "backupninja: $hostname $subject"
+	} | mail -s "backupninja: $hostname $subject" $reportemail
 fi
 
 if [ $actions_run != 0 ]; then