X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fpgsql;h=8629260720b60d0475bcadcb7b6727e8eecb4d66;hb=d600ba40c040c6a75a5b817f80184f60d9dc6eaf;hp=778680930d0b792621e5fbeb87c0d9b3092f6f0f;hpb=cfc47e5571e61f4323b9f64f9cbb64dfbc4bf1b4;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/pgsql b/handlers/pgsql
index 7786809..8629260 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,25 +10,24 @@ 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
+# If vservers are enabled, check that $vsname exists, and decide if the
+# handler should use it or if it should just operate on the host.
+local usevserver=no
+if [ $vservers_are_available = yes ]; then
+   if ! vservers_exist "$vsname" ; then
+      fatal "The vserver given in vsname ($vsname) does not exist."
+   else
+      info "using vserver '$vsname'"
+      usevserver=yes
+   fi
 fi
 
 # As needed, make sure that :
-#   * the specified vserver exists and is running
+#   * the specified vserver is running
 #   * the specified vserver or host has the needed executables
-if [ $usevserver ]; then
+if [ $usevserver = yes ]; 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
@@ -58,10 +57,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 +68,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 +89,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