diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2022-05-03 15:06:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 15:06:40 +0200 |
| commit | 33cb61b300e0b8293c22676a3cf2945ef4732fdf (patch) | |
| tree | de4c3c51d1ae25fbbdc8d7ff16910f10d9783966 /vespabase | |
| parent | ba40d4f84d8b5a62634d68ac9ce671a5044210b2 (diff) | |
Revert "Set permissions on all intermediate directories as well"
Diffstat (limited to 'vespabase')
| -rwxr-xr-x | vespabase/src/rhel-prestart.sh | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index 62e416c2cc2..dbc77879efe 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -89,21 +89,29 @@ fixdir () { echo "fixdir: Expected 4 params, got:" "$@" exit 1 fi - - parent=`dirname "$4"` - [ -d "$parent" ] || fixdir "$1" "$2" "$3" "$parent" - [ -d "$4" ] || mkdir --mode "$3" "$4" - [ "${VESPA_UNPRIVILEGED}" == yes ] || chown $1:$2 "$4" + mkdir -p "$4" + if [ "${VESPA_UNPRIVILEGED}" != yes ]; then + chown $1 "$4" + chgrp $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 @@ -112,9 +120,11 @@ 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 |