aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2006-04-24 16:16:12 +0000
committerintrigeri <intrigeri@boum.org>2006-04-24 16:16:12 +0000
commita8c5734f5471c1578828662d1046e41aaf31cf99 (patch)
tree5797bec0752f06c1126afc0cd6f1e42336b7830f
parent806d97652f404adacb83bce8ff843d8dabc2bf00 (diff)
downloadbackupninja-a8c5734f5471c1578828662d1046e41aaf31cf99.tar.gz
backupninja-a8c5734f5471c1578828662d1046e41aaf31cf99.tar.bz2
pgsql: postgres user UID is now the one from inside the vserver if necessary
-rw-r--r--ChangeLog1
-rw-r--r--handlers/pgsql6
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a414a3..ae871bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ version 0.9.4 -- unreleased
. Fixed inversed vsname emptiness check
. Fixed su quote usage to be more posixy
. Fixed shell expansion, thanks Thomas Kotzian (Closes: #363297)
+ . postgres user UID is now the one from inside the vserver if necessary
svn:
. Fixed inversed vsname emptiness check
rdiff:
diff --git a/handlers/pgsql b/handlers/pgsql
index b67b3f1..0c72c82 100644
--- a/handlers/pgsql
+++ b/handlers/pgsql
@@ -61,7 +61,11 @@ fi
# give backup dir the good uid and permissions
# (in respect to the vserver, if $usevserver = yes)
-pguid=`getent passwd postgres | awk -F: '{print $3}'`
+if [ $usevserver = yes ]; then
+ pguid=`$VSERVER $vsname exec getent passwd postgres | awk -F: '{print $3}'`
+else
+ pguid=`getent passwd postgres | awk -F: '{print $3}'`
+fi
[ -n "$pguid" ] || \
fatal "No user called postgres`[ $usevserver = no ] || echo \" on vserver $vsname\"`."
debug "chown $pguid $vroot$backupdir"