Skip to content
Snippets Groups Projects
Commit e5098e0c authored by intrigeri's avatar intrigeri
Browse files

handlers/pgsql: make use of the new lib/vserver functionality

parent a99d0598
Branches
Tags
No related merge requests found
...@@ -17,6 +17,8 @@ version 0.9.3 -- unreleased ...@@ -17,6 +17,8 @@ version 0.9.3 -- unreleased
. now works when multiple vservers names are given (separated by space) . now works when multiple vservers names are given (separated by space)
in vsnames config variable in vsnames config variable
. make use of new lib/vserver functionality . make use of new lib/vserver functionality
pgsql
. make use of new lib/vserver functionality
rdiff rdiff
. make use of new lib/vserver functionality . make use of new lib/vserver functionality
. fixed globbing bug in include, exclude and vsinclude options . fixed globbing bug in include, exclude and vsinclude options
......
...@@ -12,19 +12,20 @@ localhost=`hostname` ...@@ -12,19 +12,20 @@ localhost=`hostname`
# If vservers are configured, decide if the handler should # If vservers are configured, decide if the handler should
# use them or if it should just operate on the host # use them or if it should just operate on the host
if [ "$vservers" == "yes" ]; then local usevserver=no
if [ ! -z $vsname ]; then if [ $vservers_are_available = yes ]; then
info "using vserver '$vsname'" if ! vservers_exist "$vsname" ; then
usevserver=1 fatal "At least one of the vservers listed in vsnames ($vsnames) does not exist."
else else
info "no vserver name specified, actions will be performed on the host" info "using vserver '$vsname'"
usevserver=yes
fi fi
fi fi
# As needed, make sure that : # As needed, make sure that :
# * the specified vserver exists and is running # * the specified vserver exists and is running
# * the specified vserver or host has the needed executables # * the specified vserver or host has the needed executables
if [ $usevserver ]; then if [ $usevserver = yes ]; then
info "examining vserver '$vsname'" info "examining vserver '$vsname'"
# does it exist ? # does it exist ?
vroot="$VROOTDIR/$vsname" vroot="$VROOTDIR/$vsname"
...@@ -58,10 +59,10 @@ fi ...@@ -58,10 +59,10 @@ fi
[ -d $vroot$backupdir ] || fatal "Backup directory '$vroot$backupdir'" [ -d $vroot$backupdir ] || fatal "Backup directory '$vroot$backupdir'"
# give backup dir the good uid and permissions # 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}'` pguid=`getent passwd postgres | awk -F: '{print $3}'`
[ -n "$pguid" ] || \ [ -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" debug "chown $pguid $vroot$backupdir"
chown $pguid $vroot$backupdir chown $pguid $vroot$backupdir
debug "chmod 700 $vroot$backupdir" debug "chmod 700 $vroot$backupdir"
...@@ -69,7 +70,7 @@ chmod 700 $vroot$backupdir ...@@ -69,7 +70,7 @@ chmod 700 $vroot$backupdir
# if $databases = all, use pg_dumpall # if $databases = all, use pg_dumpall
if [ "$databases" == "all" ]; then if [ "$databases" == "all" ]; then
if [ $usevserver ]; then if [ $usevserver = yes ]; then
execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMPALL > $backupdir/${vsname}.sql" execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMPALL > $backupdir/${vsname}.sql"
else else
execstr="su - postgres -c $PGSQLDUMPALL > $backupdir/${localhost}-all.sql" execstr="su - postgres -c $PGSQLDUMPALL > $backupdir/${localhost}-all.sql"
...@@ -90,7 +91,7 @@ if [ "$databases" == "all" ]; then ...@@ -90,7 +91,7 @@ if [ "$databases" == "all" ]; then
# else use pg_dump on each specified database # else use pg_dump on each specified database
else else
for db in $databases; do for db in $databases; do
if [ $usevserver ] if [ $usevserver = yes ]
then then
execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMP $db > $backupdir/${db}.sql" execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMP $db > $backupdir/${db}.sql"
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment