diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-11-17 14:04:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-17 14:04:22 +0100 |
commit | 2d6d32a53fd857d52130b48ede4aaf166a32cd75 (patch) | |
tree | 0053742775de71d6ce4cfbd1450bf5ce7288eb1b | |
parent | 19ea989b2c7c082927d9b2919c1d00fad93866f4 (diff) | |
parent | 19f5513f4123111769e3cff280ac0ea3f194d083 (diff) |
Merge pull request #20060 from vespa-engine/revert-20059-revert-20055-freva/permissions
Reapply "Fix VESPA_HOME permissions to VESPA_USER & VESPA_GROUP"
-rwxr-xr-x | vespabase/src/rhel-prestart.sh | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index 395a3e3d91d..dbc77879efe 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 |