aboutsummaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-10-24 14:30:50 +0200
committerjonmv <venstad@gmail.com>2022-10-24 14:30:50 +0200
commit866f746d5d608782f6de38af93bf5e2305cbf781 (patch)
treeb439f23b9c9b3d5db527a088b51e707dff460cad /configserver
parentb10fff0ea77b6d7bb312f159332b8de2fec5a84c (diff)
Revert "Merge pull request #24519 from vespa-engine/ean/remove-vespa-unprivileged"
This reverts commit 1afef7d4676c17d70087aeb36df228faf7073afd, reversing changes made to 2dc4c6b58004d51af887c49760a98804803ab73f.
Diffstat (limited to 'configserver')
-rwxr-xr-xconfigserver/src/main/sh/start-configserver6
1 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 8e7a9d7839a..f223c0a8fb9 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -78,7 +78,7 @@ cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
fixfile () {
if [ -f $1 ]; then
- if [ "${VESPA_USER}" ] && [ "$(id -u)" -eq 0 ]; then
+ if [ "${VESPA_USER}" ] && [ "${VESPA_UNPRIVILEGED}" != yes ]; then
chown ${VESPA_USER} $1
fi
chmod 644 $1
@@ -90,8 +90,8 @@ fixddir () {
echo "Creating data directory $1"
mkdir -p $1 || exit 1
fi
- if [ "${VESPA_USER}" ] && [ "$(id -u)" -eq 0 ]; then
- chown ${VESPA_USER} $1
+ if [ "${VESPA_USER}" ] && [ "${VESPA_UNPRIVILEGED}" != yes ]; then
+ chown ${VESPA_USER} $1
fi
chmod 755 $1
}