From 3744cffe4bbcdfdab35d4dbc80e6ef31276c12ee Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 9 Aug 2005 20:53:19 +0000 Subject: [PATCH] Added a few safety checks to pgsql handler. git-svn-id: http://code.autistici.org/svn/backupninja/trunk@162 758a04ac-41e6-0310-8a23-8373a73cc35d --- changelog | 4 ++++ handlers/pgsql | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/changelog b/changelog index a37d6aa..51ee159 100644 --- a/changelog +++ b/changelog @@ -16,6 +16,10 @@ version XX -- ... make use of configurable $VSERVERINFO instead of hard-coded vserver-info. fixed dpkg existence test inside vserver. fixed $nodpkg use. + changes to pgsql handler + now checks if the specified vserver is running. + now checks if $PGSQLDUMP/$PGSQLDUMPALL are available where needed. + now checks if "postgres" user exists on the host/vserver. version 0.7 -- July 26 2005 added ninjahelper: a dialog based wizard for creating backupninja configs. diff --git a/handlers/pgsql b/handlers/pgsql index 8d8f0c7..3f7d0b9 100644 --- a/handlers/pgsql +++ b/handlers/pgsql @@ -11,33 +11,56 @@ localhost=`hostname` # If vservers are configured, decide if the handler should # use them or if it should just operate on the host - -if [ "$vservers" == "yes" ] - then - if [ ! -z $vsname ] - then - info "Using vserver '$vsname'" +if [ "$vservers" == "yes" ]; then + if [ ! -z $vsname ]; then + info "using vserver '$vsname'" usevserver=1 else - info "No vserver name specified, actions will be performed on the host" + info "no vserver name specified, actions will be performed on the host" fi fi -# Check to make sure that the specified vserver exists -if [ $usevserver ] - then +# As needed, make sure that : +# * the specified vserver exists and is running +# * the specified vserver or host has the needed executables +if [ $usevserver ]; then + info "examining vserver '$vsname'" + # does it exist ? vroot="$VROOTDIR/$vsname" [ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'" + # is it running ? + running=`$VSERVERINFO $vsname RUNNING` + if [ $running = 1 ]; then + if [ "$databases" == "all" ]; then + [ -x "$vroot`$VSERVER $vsname exec which $PGSQLDUMPALL`" ] || \ + fatal "Can't find $PGSQLDUMPALL in vserver $vsname." + else + [ -x "$vroot`$VSERVER $vsname exec which $PGSQLDUMP`" ] || \ + fatal "Can't find $PGSQLDUMP in vserver $vsname." + fi + else + fatal "vserver $vsname is not running." + fi +else + if [ "$databases" == "all" ]; then + [ -x "`which $PGSQLDUMPALL`" ] || \ + fatal "Can't find $PGSQLDUMPALL." + else + [ -x "`which $PGSQLDUMP`" ] || \ + fatal "Can't find $PGSQLDUMP." + fi fi # create backup dir, the vroot variable will be empty if no vsname was specified # and will proceed to operate on the host -[ -d $vroot$backupdir ] || mkdir -p $vroot$backupdir +[ -d $vroot$backupdir ] || (debug "mkdir -p $vroot$backupdir"; mkdir -p $vroot$backupdir) [ -d $vroot$backupdir ] || fatal "Backup directory '$vroot$backupdir'" # give backup dir the good uid and permissions # (in respect to the vserver, if $usevserver) pguid=`grep '^postgres:' $vroot/etc/passwd | awk -F: '{print $3}'` +[ -n "$pguid" ] || \ + fatal "No user called postgres`[ $usevserver != 1 ] || echo \" on vserver $vsname\"`." debug "chown $pguid $vroot$backupdir" chown $pguid $vroot$backupdir debug "chmod 700 $vroot$backupdir" -- 2.30.2