From 27b4a877f55c05beeb9d727e7724e5f1ad165eb8 Mon Sep 17 00:00:00 2001 From: librelad Date: Mon, 25 May 2026 17:42:20 +0100 Subject: [PATCH] refactor(cleanup): retire the dead SFTP 'Docker Manager User' to unused/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CFG_DOCKER_MANAGER_USER / installDockerManagerUser was a chrooted SFTP file-access user — unrelated to the LibrePortal control-plane manager (sudo_user_name), and the source of the 'two managers' confusion. It was permanently-off dead code: the gate CFG_DOCKER_MANAGER_ENABLED and the CFG_DOCKER_MANAGER_USER/_PASS keys are defined in no config template, so it never ran. Its SSH-key-management sibling (unused/ssh_manager.sh) was already retired; admin host SSH access is handled by the current /ssh page + scripts/ssh/host_access.sh. Move install_user_manager.sh / uninstall_user_manager.sh / check_manager.sh to scripts/unused/manager/ (recoverable, matches the graveyard convention — not deleted, in case the SFTP-user idea is rebuilt cleanly later), drop the two call sites (start_preinstall.sh, check_requirements.sh), regenerate the arrays. Co-Authored-By: Claude Opus 4.7 Signed-off-by: librelad --- scripts/checks/check_requirements.sh | 1 - scripts/source/files/arrays/files_checks.sh | 1 - scripts/source/files/arrays/files_install.sh | 2 -- scripts/start/start_preinstall.sh | 1 - .../{checks/requirements => unused/manager}/check_manager.sh | 0 scripts/{install => unused}/manager/install_user_manager.sh | 0 scripts/{install => unused}/manager/uninstall_user_manager.sh | 0 7 files changed, 5 deletions(-) rename scripts/{checks/requirements => unused/manager}/check_manager.sh (100%) rename scripts/{install => unused}/manager/install_user_manager.sh (100%) rename scripts/{install => unused}/manager/uninstall_user_manager.sh (100%) diff --git a/scripts/checks/check_requirements.sh b/scripts/checks/check_requirements.sh index 8b5ec05..fbde027 100755 --- a/scripts/checks/check_requirements.sh +++ b/scripts/checks/check_requirements.sh @@ -19,7 +19,6 @@ checkRequirements() checkDockerNetworkRequirement; checkUFWRequirement; checkUFWDRequirement; - checkManagerRequirement; checkSSLCertsRequirement; checkSwapfileRequirement; checkCrontabRequirement; diff --git a/scripts/source/files/arrays/files_checks.sh b/scripts/source/files/arrays/files_checks.sh index d641b45..fcc1ae7 100755 --- a/scripts/source/files/arrays/files_checks.sh +++ b/scripts/source/files/arrays/files_checks.sh @@ -18,7 +18,6 @@ checks_scripts=( "checks/requirements/check_docker.sh" "checks/requirements/check_docker_switcher.sh" "checks/requirements/check_install_type.sh" - "checks/requirements/check_manager.sh" "checks/requirements/check_passwords.sh" "checks/requirements/check_root.sh" "checks/requirements/check_sslcerts.sh" diff --git a/scripts/source/files/arrays/files_install.sh b/scripts/source/files/arrays/files_install.sh index 3ca1fa5..bd47d70 100755 --- a/scripts/source/files/arrays/files_install.sh +++ b/scripts/source/files/arrays/files_install.sh @@ -11,7 +11,5 @@ install_scripts=( "install/install_swapfile.sh" "install/install_ufwd.sh" "install/install_ufw.sh" - "install/manager/install_user_manager.sh" - "install/manager/uninstall_user_manager.sh" ) diff --git a/scripts/start/start_preinstall.sh b/scripts/start/start_preinstall.sh index 60c4d6e..f5b6794 100755 --- a/scripts/start/start_preinstall.sh +++ b/scripts/start/start_preinstall.sh @@ -29,7 +29,6 @@ startPreInstall() # Both installDockerNetwork; - installDockerManagerUser ####################################################### ### Install UFW Firewall ### diff --git a/scripts/checks/requirements/check_manager.sh b/scripts/unused/manager/check_manager.sh similarity index 100% rename from scripts/checks/requirements/check_manager.sh rename to scripts/unused/manager/check_manager.sh diff --git a/scripts/install/manager/install_user_manager.sh b/scripts/unused/manager/install_user_manager.sh similarity index 100% rename from scripts/install/manager/install_user_manager.sh rename to scripts/unused/manager/install_user_manager.sh diff --git a/scripts/install/manager/uninstall_user_manager.sh b/scripts/unused/manager/uninstall_user_manager.sh similarity index 100% rename from scripts/install/manager/uninstall_user_manager.sh rename to scripts/unused/manager/uninstall_user_manager.sh