r261@crapouille: intrigeri | 2005-12-28 20:59:01 +0100

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

diff --git a/handlers/pgsql b/handlers/pgsql
index 3f7d0b9ac943e38b5f5c82f5318156c44b0420ab..778680930d0b792621e5fbeb87c0d9b3092f6f0f 100644 (file)
--- a/handlers/pgsql
+++ b/handlers/pgsql
@@ -1,3 +1,4 @@
+# -*- mode: sh; sh-basic-offset: 8; indent-tabs-mode: nil; -*-
 #
 # PostgreSQL handler script for backupninja
 #
@@ -30,7 +31,7 @@ if [ $usevserver ]; then
     [ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
     # is it running ?
     running=`$VSERVERINFO $vsname RUNNING`
-    if [ $running = 1 ]; then
+    if [ "$running" = "1" ]; then
        if [ "$databases" == "all" ]; then
            [ -x "$vroot`$VSERVER $vsname exec which $PGSQLDUMPALL`" ] || \
                fatal "Can't find $PGSQLDUMPALL in vserver $vsname."
@@ -58,7 +59,7 @@ fi
 
 # 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}'`
+pguid=`getent passwd postgres | awk -F: '{print $3}'`
 [ -n "$pguid" ] || \
     fatal "No user called postgres`[ $usevserver != 1 ] || echo \" on vserver $vsname\"`."
 debug "chown $pguid $vroot$backupdir"
@@ -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