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

diff --git a/handlers/pgsql b/handlers/pgsql
index 8d8f0c7..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
 #
@@ -11,33 +12,56 @@ 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'"
+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"
+	info "no vserver name specified, actions will be performed on the host"
     fi
 fi
 
-# Check to make sure that the specified vserver exists
-if [ $usevserver ]
-    then
+# 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
+else
+    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
 # and will proceed to operate on the host
-[ -d $vroot$backupdir ] || mkdir -p $vroot$backupdir
+[ -d $vroot$backupdir ] || (debug "mkdir -p $vroot$backupdir"; mkdir -p $vroot$backupdir)
 [ -d $vroot$backupdir ] || fatal "Backup directory '$vroot$backupdir'"
 
 # 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"
 chown $pguid $vroot$backupdir
 debug "chmod 700 $vroot$backupdir"
@@ -46,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"
@@ -68,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