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>
31 lines
1.4 KiB
Bash
Executable File
31 lines
1.4 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
copyFolder()
|
|
{
|
|
local folder="$1"
|
|
local folder_name=$(basename "$folder")
|
|
local save_dir="$2"
|
|
local user_name="$3" # advisory — the destination path determines the owner
|
|
|
|
# Write as the destination's owner — no root, no chown (see copyFile).
|
|
if [[ "$save_dir" == "$containers_dir"* || "$save_dir" == "${LP_CONTAINERS_DIR:-/libreportal-containers}"/* ]]; then
|
|
if [[ "$folder" == "$containers_dir"* || "$folder" == "${LP_CONTAINERS_DIR:-/libreportal-containers}"/* ]]; then
|
|
# container -> container: same owner (dockerinstall), a plain cp works.
|
|
local result=$(runFileOp cp -rf "$folder" "$save_dir")
|
|
else
|
|
# Cross-owner: a manager-owned source (e.g. the install dir) into the
|
|
# container-owned destination. Under rootless a single cp can't read
|
|
# one end and write the other, so bridge with a tar pipe — the manager
|
|
# reads the source, dockerinstall writes the destination. No root, no
|
|
# chown; files land owned by the destination user. pipefail so a
|
|
# read-side failure isn't masked by a "successful" empty extract.
|
|
( set -o pipefail
|
|
runInstallOp tar -C "$(dirname "$folder")" -cf - "$folder_name" \
|
|
| runFileOp tar -C "$save_dir" -xf - )
|
|
fi
|
|
else
|
|
local result=$(runInstallOp cp -rf "$folder" "$save_dir")
|
|
fi
|
|
checkSuccess "Copying $folder_name to $save_dir"
|
|
}
|