projects
/
matthijs
/
upstream
/
backupninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5098e0
)
handlers/pgsql: make more use of the new lib/vserver functionality
author
intrigeri
<intrigeri@boum.org>
Thu, 19 Jan 2006 21:57:54 +0000
(21:57 +0000)
committer
intrigeri
<intrigeri@boum.org>
Thu, 19 Jan 2006 21:57:54 +0000
(21:57 +0000)
handlers/pgsql
patch
|
blob
|
history
diff --git
a/handlers/pgsql
b/handlers/pgsql
index 63062f7084175454940c4eff9be561f73d991a54..8629260720b60d0475bcadcb7b6727e8eecb4d66 100644
(file)
--- a/
handlers/pgsql
+++ b/
handlers/pgsql
@@
-10,12
+10,12
@@
getconf vsname
localhost=`hostname`
localhost=`hostname`
-# If vservers are
configured, decide if the handler should
-#
use them or if it should just operate on the host
+# If vservers are
enabled, check that $vsname exists, and decide if the
+#
handler should use it or if it should just operate on the host.
local usevserver=no
if [ $vservers_are_available = yes ]; then
if ! vservers_exist "$vsname" ; then
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."
+ fatal "
The vserver given in vsname ($vsname
) does not exist."
else
info "using vserver '$vsname'"
usevserver=yes
else
info "using vserver '$vsname'"
usevserver=yes
@@
-23,13
+23,11
@@
if [ $vservers_are_available = yes ]; then
fi
# As needed, make sure that :
fi
# As needed, make sure that :
-# * the specified vserver
exists and
is running
+# * the specified vserver is running
# * the specified vserver or host has the needed executables
if [ $usevserver = yes ]; then
info "examining vserver '$vsname'"
# * the specified vserver or host has the needed executables
if [ $usevserver = yes ]; then
info "examining vserver '$vsname'"
- # does it exist ?
vroot="$VROOTDIR/$vsname"
vroot="$VROOTDIR/$vsname"
- [ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
# is it running ?
running=`$VSERVERINFO $vsname RUNNING`
if [ "$running" = "1" ]; then
# is it running ?
running=`$VSERVERINFO $vsname RUNNING`
if [ "$running" = "1" ]; then