aboutsummaryrefslogtreecommitdiffstats
path: root/vespabase
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2021-11-17 12:51:14 +0100
committerGitHub <noreply@github.com>2021-11-17 12:51:14 +0100
commit5127976759a450ab4c4b88876ffa7816adf6ef22 (patch)
treeadff132ce76ad3819885199dcce33d064d84a10f /vespabase
parent1a1f46e024fccc5c783c93074e79e33279c97428 (diff)
Revert "Revert "Fix VESPA_HOME permissions to VESPA_USER & VESPA_GROUP""
Diffstat (limited to 'vespabase')
-rwxr-xr-xvespabase/src/rhel-prestart.sh55
1 files changed, 29 insertions, 26 deletions
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index 395a3e3d91d..6ef3d6f59c3 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -78,6 +78,9 @@ findhost
if [ "$VESPA_USER" = "" ]; then
VESPA_USER=$(id -run)
fi
+if [ "$VESPA_GROUP" = "" ]; then
+ $VESPA_GROUP=$(id -rgn)
+fi
cd $VESPA_HOME || { echo "Cannot cd to $VESPA_HOME" 1>&2; exit 1; }
@@ -96,32 +99,32 @@ fixdir () {
# BEGIN directory fixups
-fixdir root root 1777 logs
-fixdir root root 1777 tmp
-fixdir root root 1777 var/run
-fixdir ${VESPA_USER} root 1777 var/crash
-fixdir ${VESPA_USER} root 1777 logs/vespa
-fixdir ${VESPA_USER} root 1777 tmp/vespa
-fixdir root root 755 var
-fixdir ${VESPA_USER} root 755 libexec/vespa/plugins/qrs
-fixdir ${VESPA_USER} root 755 logs/vespa/configserver
-fixdir ${VESPA_USER} root 755 logs/vespa/qrs
-fixdir ${VESPA_USER} root 755 logs/vespa/search
-fixdir ${VESPA_USER} root 755 var/db/vespa
-fixdir ${VESPA_USER} root 755 var/db/vespa/tmp
-fixdir ${VESPA_USER} root 755 var/db/vespa/config_server
-fixdir ${VESPA_USER} root 755 var/db/vespa/config_server/serverdb
-fixdir ${VESPA_USER} root 755 var/db/vespa/config_server/serverdb/tenants
-fixdir ${VESPA_USER} root 755 var/db/vespa/filedistribution
-fixdir ${VESPA_USER} root 755 var/db/vespa/index
-fixdir ${VESPA_USER} root 755 var/db/vespa/logcontrol
-fixdir ${VESPA_USER} root 755 var/db/vespa/search
-fixdir ${VESPA_USER} root 755 var/jdisc_container
-fixdir ${VESPA_USER} root 755 var/vespa
-fixdir ${VESPA_USER} root 755 var/vespa/application
-fixdir ${VESPA_USER} root 755 var/vespa/bundlecache
-fixdir ${VESPA_USER} root 755 var/vespa/bundlecache/configserver
-fixdir ${VESPA_USER} root 755 var/vespa/cache/config/
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 libexec/vespa/plugins/qrs
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/configserver
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/qrs
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/search
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 tmp
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 tmp/vespa
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/crash
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/config_server
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/config_server/serverdb
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/config_server/serverdb/tenants
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/filedistribution
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/index
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/logcontrol
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/search
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/tmp
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/jdisc_container
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/run
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/application
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/bundlecache
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/bundlecache/configserver
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/cache/config/
if [ "${VESPA_UNPRIVILEGED}" != yes ]; then
chown -hR ${VESPA_USER} logs/vespa