Merge claude/1
This commit is contained in:
commit
96300d5f6b
@ -25,7 +25,8 @@ reconcileDockerOwnership()
|
|||||||
# The control plane is owned by the MANAGER user in BOTH modes. root:root was
|
# The control plane is owned by the MANAGER user in BOTH modes. root:root was
|
||||||
# never the intended model — it only ever showed up as an artifact of
|
# never the intended model — it only ever showed up as an artifact of
|
||||||
# un-de-sudo'd commands (sudo creating files as root instead of libreportal).
|
# un-de-sudo'd commands (sudo creating files as root instead of libreportal).
|
||||||
local owner="$sudo_user_name"
|
local owner="${sudo_user_name:-libreportal}"
|
||||||
|
local appusr="${docker_install_user:-$CFG_DOCKER_INSTALL_USER}"
|
||||||
|
|
||||||
# Swap ONLY the owner on our own control-plane files; never reset mode bits
|
# Swap ONLY the owner on our own control-plane files; never reset mode bits
|
||||||
# (so nothing that validates its permissions gets surprised). The only two
|
# (so nothing that validates its permissions gets surprised). The only two
|
||||||
@ -52,7 +53,7 @@ reconcileDockerOwnership()
|
|||||||
local webui_dir="${containers_dir}libreportal"
|
local webui_dir="${containers_dir}libreportal"
|
||||||
if [[ -d "$webui_dir" ]]; then
|
if [[ -d "$webui_dir" ]]; then
|
||||||
local app_owner="$owner"
|
local app_owner="$owner"
|
||||||
[[ "$mode" == "rootless" ]] && app_owner="$docker_install_user"
|
[[ "$mode" == "rootless" ]] && app_owner="$appusr"
|
||||||
runSystem chown -R "$app_owner:$app_owner" "$webui_dir"
|
runSystem chown -R "$app_owner:$app_owner" "$webui_dir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user