X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fpgsql;h=2b6f25a421d67892c1c7218c68e66472ae7f3ddd;hp=778680930d0b792621e5fbeb87c0d9b3092f6f0f;hb=b52464c19e50b738902e3333172b67d2b7c503b7;hpb=cfc47e5571e61f4323b9f64f9cbb64dfbc4bf1b4 diff --git a/handlers/pgsql b/handlers/pgsql index 7786809..2b6f25a 100644 --- a/handlers/pgsql +++ b/handlers/pgsql @@ -1,4 +1,4 @@ -# -*- mode: sh; sh-basic-offset: 8; indent-tabs-mode: nil; -*- +# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*- # # PostgreSQL handler script for backupninja # @@ -10,46 +10,48 @@ getconf vsname 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'" - usevserver=1 - else - info "no vserver name specified, actions will be performed on the host" - fi +# Decide if the handler should operate on a vserver or on the host. +# In the former case, check that $vsname exists and is running. +local usevserver=no +local vroot +if [ $vservers_are_available = yes ]; then + if [ -z "$vsname" ]; then + # does it exist ? + if ! vservers_exist "$vsname" ; then + fatal "The vserver given in vsname ($vsname) does not exist." + fi + # is it running ? + $VSERVERINFO -q $vsname RUNNING + if [ $? -ne 0 ]; then + fatal "The vserver $vsname is not running." + fi + # everything ok + info "Using vserver '$vsname'." + usevserver=yes + vroot="$VROOTDIR/$vsname" + else + info "No vserver name specified, actions will be performed on the host." + fi fi -# 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 +# Make sure that the system to backup has the needed executables +if [ $usevserver = yes ]; then + debug "Examining vserver '$vsname'." + 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 - if [ "$databases" == "all" ]; then - [ -x "`which $PGSQLDUMPALL`" ] || \ - fatal "Can't find $PGSQLDUMPALL." - else - [ -x "`which $PGSQLDUMP`" ] || \ - fatal "Can't find $PGSQLDUMP." - fi + 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 @@ -58,10 +60,10 @@ fi [ -d $vroot$backupdir ] || fatal "Backup directory '$vroot$backupdir'" # give backup dir the good uid and permissions -# (in respect to the vserver, if $usevserver) +# (in respect to the vserver, if $usevserver = yes) pguid=`getent passwd postgres | awk -F: '{print $3}'` [ -n "$pguid" ] || \ - fatal "No user called postgres`[ $usevserver != 1 ] || echo \" on vserver $vsname\"`." + fatal "No user called postgres`[ $usevserver = no ] || echo \" on vserver $vsname\"`." debug "chown $pguid $vroot$backupdir" chown $pguid $vroot$backupdir debug "chmod 700 $vroot$backupdir" @@ -69,7 +71,7 @@ chmod 700 $vroot$backupdir # if $databases = all, use pg_dumpall if [ "$databases" == "all" ]; then - if [ $usevserver ]; then + if [ $usevserver = yes ]; then execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMPALL > $backupdir/${vsname}.sql" else execstr="su - postgres -c $PGSQLDUMPALL > $backupdir/${localhost}-all.sql" @@ -90,7 +92,7 @@ if [ "$databases" == "all" ]; then # else use pg_dump on each specified database else for db in $databases; do - if [ $usevserver ] + if [ $usevserver = yes ] then execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMP $db > $backupdir/${db}.sql" else