X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fpgsql;h=778680930d0b792621e5fbeb87c0d9b3092f6f0f;hb=cfc47e5571e61f4323b9f64f9cbb64dfbc4bf1b4;hp=11a5cfef772475fbed210b7e474212034cd255e8;hpb=ad457d298e373c6ade0b5a5d1a3255ca3422eb75;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/pgsql b/handlers/pgsql index 11a5cfe..7786809 100644 --- 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"