From e5098e0cce4702e1f51c05020fe73e7f6a2f9f85 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 19 Jan 2006 21:57:45 +0000
Subject: [PATCH] handlers/pgsql: make use of the new lib/vserver functionality
---
ChangeLog | 2 ++
handlers/pgsql | 25 +++++++++++++------------
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 691620c2..d4e22269 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@ version 0.9.3 -- unreleased
. now works when multiple vservers names are given (separated by space)
in vsnames config variable
. make use of new lib/vserver functionality
+ pgsql
+ . make use of new lib/vserver functionality
rdiff
. make use of new lib/vserver functionality
. fixed globbing bug in include, exclude and vsinclude options
diff --git a/handlers/pgsql b/handlers/pgsql
index ccfe7593..63062f70 100644
--- a/handlers/pgsql
+++ b/handlers/pgsql
@@ -12,19 +12,20 @@ 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
+local usevserver=no
+if [ $vservers_are_available = yes ]; then
+ if ! vservers_exist "$vsname" ; then
+ fatal "At least one of the vservers listed in vsnames ($vsnames) 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 or host has the needed executables
-if [ $usevserver ]; then
+if [ $usevserver = yes ]; then
info "examining vserver '$vsname'"
# does it exist ?
vroot="$VROOTDIR/$vsname"
@@ -58,10 +59,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 +70,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 +91,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
--
GitLab