Webstar/LibrePortal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge claude/1

Browse Source
This commit is contained in:
librelad 2026-05-25 17:18:46 +01:00
commit f5afb91968
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containers/libreportal/backend/utils/config.js
View File

@ -42,7 +42,7 @@ const webuiLoginsConfig = parseConfigFile(path.join(__dirname, '..', '..', 'webu
const webuiLogsConfig = parseConfigFile(path.join(__dirname, '..', '..', 'webui_logs')); const webuiLogsConfig = parseConfigFile(path.join(__dirname, '..', '..', 'webui_logs'));
// Merge: later sources override earlier. webui_logins / webui_logs hold // Merge: later sources override earlier. webui_logins / webui_logs hold
// CFG_WEBUI_* keys generated from /docker/configs/webui/* and bind-mounted // CFG_WEBUI_* keys generated from the system configs/webui/* and bind-mounted
// in via libreportal's compose. // in via libreportal's compose.
const fileConfig = { ...libreportalConfig, ...webuiLoginsConfig, ...webuiLogsConfig }; const fileConfig = { ...libreportalConfig, ...webuiLoginsConfig, ...webuiLogsConfig };

2
containers/libreportal/frontend/js/components/config/config-options.js
View File

@ -257,7 +257,7 @@ class ConfigOptions {
{ value: 'rclone', label: 'rclone' } { value: 'rclone', label: 'rclone' }
], ],
PATH_MODE: [ PATH_MODE: [
{ value: 'auto', label: 'Automatic (/docker/backups/<id>)' }, { value: 'auto', label: 'Automatic (backups root, one subfolder per location)' },
{ value: 'custom', label: 'Custom path' } { value: 'custom', label: 'Custom path' }
], ],
ENGINE: [ ENGINE: [

2
containers/libreportal/frontend/js/system/setup-detector.js
View File

@ -60,7 +60,7 @@ class SetupDetector {
} }
// Detect if this is first-time setup. Source of truth is the server-side // Detect if this is first-time setup. Source of truth is the server-side
// lock file at /docker/containers/libreportal/frontend/data/.setup_complete // lock file at <containers-root>/libreportal/frontend/data/.setup_complete
// — that's what the bash setupApply function creates after a successful // — that's what the bash setupApply function creates after a successful
// wizard run. localStorage is no longer used because per-browser state // wizard run. localStorage is no longer used because per-browser state
// gives wrong answers (different browsers would each see "first install"). // gives wrong answers (different browsers would each see "first install").

8
scripts/webui/webui_install_image.sh
View File

@ -6,11 +6,11 @@ installLibrePortalImageWebUI()
isNotice "Building the LibrePortal WebUI Docker image..." isNotice "Building the LibrePortal WebUI Docker image..."
# The copy below writes into the dockerinstall-owned containers/ dir. On a # The copy below writes into the dockerinstall-owned containers root. On a
# fresh install the general traversal/ownership reconcile runs LATER, so at # fresh install the general traversal/ownership reconcile runs LATER, so at
# this point /docker is still 750 (untraversable by the container user) and # this point the system root is still 750 (untraversable by the container user)
# containers/ may still be manager-owned — the copy would fail. Establish # and the containers root may still be manager-owned — the copy would fail.
# traversal (+x on /docker) and containers/ ownership FIRST. # Establish traversal + containers-root ownership FIRST.
fixFolderPermissions fixFolderPermissions
local result=$(copyFolder "$install_containers_dir/libreportal" "$containers_dir" "$sudo_user_name") local result=$(copyFolder "$install_containers_dir/libreportal" "$containers_dir" "$sudo_user_name")