e4872ab511
Introduce scripts/source/paths.sh as the canonical path resolver for three independently-relocatable roots: LP_SYSTEM_DIR manager-owned control plane (configs/logs/install/db/ssl/ssh/migrate) LP_CONTAINERS_DIR container-user-owned live app data LP_BACKUPS_DIR container-user-owned backup repos (own mount-able) Roots come from the environment when set (install bakes them; CLI/app inherit from init.sh), else default to /libreportal-*. A transitional compat default keeps EXISTING installs (legacy single /docker tree, by config marker) on /docker until a deliberate reinstall, so deploying this never strands a running box. - init.sh derives the same vars inline (self-contained for the bare /root/init.sh reinstall case); paths.sh mirrors it for the standalone task/check processors, which now self-locate their scripts dir and source it. - Replace functional /docker literals with the derived vars across runtime, install, backup, crontab, crowdsec/restic, headscale, and reinstall paths; clean the inert '== /docker/containers/*' guard fallbacks to the variable form. - backend: CONTAINERS_DIR now from LP_CONTAINERS_DIR (compose env, filled at generation via a new CONTAINERS_DIR_TAG), legacy-safe default for un-recreated containers. - backup default path falls back to the backups root; exclude paths.sh from the sourced-file arrays (bootstrap file, sourced explicitly). The CLI-wrapper heredoc + root helpers still reference /docker; those get baked in phase 3. No layout/ownership change yet (phase 2). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Signed-off-by: librelad <librelad@digitalangels.vip>
37 lines
1.5 KiB
Bash
Executable File
37 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
createFolders()
|
|
{
|
|
local silent_flag="$1"
|
|
local user_name="$2"
|
|
|
|
for dir_path in "${@:3}"; do
|
|
local folder_name=$(basename "$dir_path")
|
|
local clean_dir=$(echo "$dir_path" | sed 's#//*#/#g')
|
|
|
|
# Under /docker/containers/<app>/ the owner is the docker install user
|
|
# (the rootless container + host generators run as it), so create the dir
|
|
# AS that user via runFileOp — creating it as the right owner avoids a
|
|
# chown-to-another-user the unprivileged runtime can't do. Mirrors
|
|
# createTouch; the $user_name hint is advisory for these paths.
|
|
if [[ "$clean_dir" == "$containers_dir"* || "$clean_dir" == "${LP_CONTAINERS_DIR:-/libreportal-containers}"/* ]]; then
|
|
if [ ! -d "$dir_path" ]; then
|
|
local result=$(runFileOp mkdir -p "$dir_path")
|
|
[ "$silent_flag" == "loud" ] && checkSuccess "Creating $folder_name directory"
|
|
elif [ "$silent_flag" == "loud" ]; then
|
|
isNotice "$folder_name directory already exists"
|
|
fi
|
|
continue
|
|
fi
|
|
|
|
# Non-container path = manager-owned control plane -> create AS the
|
|
# manager (runInstallOp); no root, no chown.
|
|
if [ ! -d "$dir_path" ]; then
|
|
local result=$(runInstallOp mkdir -p "$dir_path")
|
|
[ "$silent_flag" == "loud" ] && checkSuccess "Creating $folder_name directory"
|
|
elif [ "$silent_flag" == "loud" ]; then
|
|
isNotice "$folder_name directory already exists"
|
|
fi
|
|
done
|
|
}
|