mysql and dup handlers: when using a vserver, check if it is running

[matthijs/upstream/backupninja.git] / handlers / pgsql

diff --git a/handlers/pgsql b/handlers/pgsql
index 3f7d0b9ac943e38b5f5c82f5318156c44b0420ab..9b1d8b7f4de134fae545e2490c3a98b53ed54022 100644 (file)
--- a/handlers/pgsql
+++ b/handlers/pgsql
@@ -1,3 +1,4 @@
+#! /bin/sh
 #
 # PostgreSQL handler script for backupninja
 #
@@ -69,14 +70,14 @@ chmod 700 $vroot$backupdir
 # if $databases = all, use pg_dumpall
 if [ "$databases" == "all" ]; then
     if [ $usevserver ]; then
-       execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMPALL > $vroot$backupdir/${vsname}.sql"
+       execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMPALL > $backupdir/${vsname}.sql"
     else
        execstr="su - postgres -c $PGSQLDUMPALL > $backupdir/${localhost}-all.sql"
     fi
     debug "$execstr"
     if [ ! $test ]; then
-       output=`$execstr 2>&1`
-       code=$?
+       output=`$execstr 2>&1`
+       code=$?
        if [ "$code" == "0" ]; then
            debug $output
            info "Successfully finished dump of pgsql cluster"
@@ -91,7 +92,7 @@ else
     for db in $databases; do
        if [ $usevserver ]
            then
-           execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMP $db > $vroot$backupdir/${db}.sql"
+           execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMP $db > $backupdir/${db}.sql"
        else
            execstr="su - postgres -c $PGSQLDUMP $db > $backupdir/${db}.sql"
        fi