X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=backupninja;h=6b888cb006e85609f04bbc2a369184510aaec687;hb=030f94dfdccfa6824e1f4e9c7bfdf713cb814d02;hp=a59d40067c9eafa3be4e183ee2d0f34ef2b34c9f;hpb=7691261c2d059ec04b8448410febde6ef214418d;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/backupninja b/backupninja index a59d400..6b888cb 100755 --- a/backupninja +++ b/backupninja @@ -3,7 +3,7 @@ # B A C K U P N I N J A /()/ # `\| # -# Copyright (C) 2004 riseup.net -- property is theft. +# Copyright (C) 2004-05 riseup.net -- property is theft. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -87,9 +87,13 @@ function printmsg() { fi if [ $print -lt $loglevel ]; then - if [ -w "$logfile" ]; then - colorize "$typestr$@" >> $logfile - fi + logmsg "$typestr$@" + fi +} + +function logmsg() { + if [ -w "$logfile" ]; then + echo -e `date "+%h %d %H:%M:%S"` "$@" >> $logfile fi } @@ -159,9 +163,11 @@ function check_perms() { local perms=`ls -ld $file` perms=${perms:4:6} if [ "$perms" != "------" ]; then + echo "Configuration files must not be group or world readable! Dying on file $file" fatal "Configuration files must not be group or world 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 } @@ -266,9 +272,9 @@ function process_action() { # is not set to the current time. getconf when "$defaultwhen" if [ "$processnow" == 1 ]; then - info "running $file because of --now" + info ">>>> starting action $file (because of --now)" elif [ "$when" == "hourly" ]; then - debug "running $file because 'when = hourly'" + info ">>>> starting action $file (because 'when = hourly')" else IFS=$'\t\n' for w in $when; do @@ -280,7 +286,7 @@ function process_action() { debug "skipping $file because it is not $w" return else - info "running $file because it is $w" + info ">>>> starting action $file (because it is $w)" fi done IFS=$' \t\n' @@ -312,19 +318,18 @@ function process_action() { rm $bufferfile if [ $_fatals != 0 ]; then msg "*failed* -- $file" - errormsg="$errormsg\n== failures from $file ==\n\n$ret\n" + passthru "Fatal: <<<< finished action $file: FAILED" elif [ $_errors != 0 ]; then msg "*error* -- $file" errormsg="$errormsg\n== errors from $file ==\n\n$ret\n" + error "<<<< finished action $file: ERROR" elif [ $_warnings != 0 ]; then msg "*warning* -- $file" errormsg="$errormsg\n== warnings from $file ==\n\n$ret\n" + warning "<<<< finished action $file: WARNING" else msg "success -- $file" -# elif [ $retcode == 0 ]; then -# msg "success -- $file" -# else -# msg "unknown -- $file" + info "<<<< finished action $file: SUCCESS" fi let "fatals += _fatals" @@ -351,6 +356,7 @@ while [ $# -ge 1 ]; do if [ -f $2 ]; then conffile=$2 else + echo "-f|--conffile option must be followed by an existing filename" fatal "-f|--conffile option must be followed by an existing filename" usage fi @@ -363,6 +369,7 @@ while [ $# -ge 1 ]; do singlerun=$2 processnow=1 else + echo "--run option must be fallowed by a backupninja action file" fatal "--run option must be fallowed by a backupninja action file" usage fi @@ -370,6 +377,7 @@ while [ $# -ge 1 ]; do ;; *) debug=1 + echo "Unknown option $1" fatal "Unknown option $1" usage exit @@ -385,10 +393,22 @@ done ## Load and confirm basic configuration values # bootstrap -[ -r "$conffile" ] || fatal "Configuration file $conffile not found." +if [ ! -r "$conffile" ]; then + echo "Configuration file $conffile not found." + fatal "Configuration file $conffile not found." +fi + scriptdir=`grep scriptdirectory $conffile | awk '{print $3}'` -[ -n "$scriptdir" ] || fatal "Cound not find entry 'scriptdirectory' in $conffile" -[ -d "$scriptdir" ] || fatal "Script directory $scriptdir not found." +if [ ! -n "$scriptdir" ]; then + echo "Cound not find entry 'scriptdirectory' in $conffile" + fatal "Cound not find entry 'scriptdirectory' in $conffile" +fi + +if [ ! -d "$scriptdir" ]; then + echo "Script directory $scriptdir not found." + fatal "Script directory $scriptdir not found." +fi + setfile $conffile # get global config options (second param is the default) @@ -402,14 +422,23 @@ defaultwhen=$when getconf logfile /var/log/backupninja.log getconf usecolors "yes" getconf SLAPCAT /usr/sbin/slapcat +getconf LDAPSEARCH /usr/bin/ldapsearch getconf RDIFFBACKUP /usr/bin/rdiff-backup getconf MYSQL /usr/bin/mysql getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy getconf MYSQLDUMP /usr/bin/mysqldump 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` + +if [ ! -d "$configdirectory" ]; then + echo "Configuration directory '$configdirectory' not found." + fatal "Configuration directory '$configdirectory' not found." +fi -[ -d "$configdirectory" ] || fatal "Configuration directory '$configdirectory' not found." [ -f "$logfile" ] || touch $logfile if [ "$UID" != "0" ]; then @@ -417,6 +446,11 @@ 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. @@ -480,3 +514,6 @@ if [ $doit == 1 ]; then } | mail $reportemail -s "backupninja: $hostname $subject" fi +if [ $actions_run != 0 ]; then + info "FINISHED: $actions_run actions run. $fatals fatal. $errors error. $warnings warning." +fi