diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-04-19 15:50:28 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-04-19 15:52:31 +0200 |
commit | d264d6762040579acb1bccc56e471877e580516c (patch) | |
tree | 4403a51984c87b2dfb3886da0f8af57343511218 | |
parent | 21fabed40914da78e71b93db0c3557d900fc45bf (diff) |
Fix permissions
-rwxr-xr-x | vespabase/src/rhel-prestart.sh | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index dbc77879efe..376e916cfd0 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -89,29 +89,29 @@ fixdir () { echo "fixdir: Expected 4 params, got:" "$@" exit 1 fi - mkdir -p "$4" + + parent=`dirname "$4"` + if ! [ -d "$parent" ]; then + fixdir "$1" "$2" "$3" "$parent" + fi + + if ! [ -d "$4" ]; then + mkdir --mode "$3" "$4" + fi + if [ "${VESPA_UNPRIVILEGED}" != yes ]; then - chown $1 "$4" - chgrp $2 "$4" + chown $1:$2 "$4" fi - chmod $3 "$4" } # BEGIN directory fixups 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 @@ -120,11 +120,9 @@ 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/ +fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/cache/config if [ "${VESPA_UNPRIVILEGED}" != yes ]; then chown -hR ${VESPA_USER} logs/vespa |