5f4f4eb96f
The task processor reads CFG_DOCKER_INSTALL_TYPE once at startup to decide how runFileOp writes into the task dir (rootless -> as the docker install user, rooted -> as the manager). After a rooted<->rootless swap a running instance keeps the old mode and writes task files wrong. Add restartLibrePortalWebUITaskService and call it at the end of both switch branches so the processor re-sources the new mode. The switch is a CLI one-shot, not a processor task, so the restart won't interrupt it. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Signed-off-by: librelad <librelad@digitalangels.vip>
88 lines
3.2 KiB
Bash
Executable File
88 lines
3.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# LibrePortal Task Processor Systemd Service Setup
|
|
# Replaces crontabSetupTaskProcessor with systemd service
|
|
installLibrePortalWebUITaskService()
|
|
{
|
|
if [[ "$CFG_REQUIREMENT_WEBUI_SERVICE" == "true" ]]; then
|
|
local service_file="/etc/systemd/system/libreportal.service"
|
|
if [[ ! -f "$service_file" ]]; then
|
|
local task_processor_script="$install_scripts_dir/crontab/task/crontab_task_processor.sh"
|
|
local task_dir="$containers_dir/libreportal/frontend/data/tasks"
|
|
|
|
# Update TASK_DIR in the task processor script
|
|
if [ -f "$task_processor_script" ]; then
|
|
sed -i "s|TASK_DIR=\".*\"|TASK_DIR=\"$task_dir\"|g" "$task_processor_script"
|
|
chmod +x "$task_processor_script"
|
|
else
|
|
isNotice "Task processor script not found"
|
|
fi
|
|
|
|
# Rootless docker exposes the daemon at /run/user/<uid>/docker.sock and
|
|
# depends on XDG_RUNTIME_DIR being set. Systemd units don't inherit user
|
|
# bashrc, so without these Environment= lines the processor would fall
|
|
# back to /var/run/docker.sock (which rootless does not create) and any
|
|
# `docker …` call inside the task would fail. Rootful gets no extras —
|
|
# the default /var/run path is already correct.
|
|
local service_env_block=""
|
|
if [[ "$CFG_DOCKER_INSTALL_TYPE" == "rootless" ]]; then
|
|
local libreportal_uid
|
|
libreportal_uid="$(id -u "$sudo_user_name")"
|
|
service_env_block="Environment=DOCKER_HOST=unix:///run/user/${libreportal_uid}/docker.sock
|
|
Environment=XDG_RUNTIME_DIR=/run/user/${libreportal_uid}"
|
|
fi
|
|
|
|
# Create systemd service file
|
|
runSystem tee "$service_file" > /dev/null <<EOF
|
|
[Unit]
|
|
Description=LibrePortal Task Processor
|
|
After=network.target
|
|
Wants=network.target
|
|
|
|
[Service]
|
|
Type=simple
|
|
User=$sudo_user_name
|
|
Group=$sudo_user_name
|
|
WorkingDirectory=$install_scripts_dir
|
|
ExecStart=$task_processor_script start_script
|
|
Restart=always
|
|
RestartSec=5
|
|
SyslogIdentifier=libreportal
|
|
${service_env_block}
|
|
|
|
# Security
|
|
PrivateTmp=true
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
EOF
|
|
|
|
# Remove from crontab if it exists
|
|
if sudo -u $sudo_user_name crontab -l 2>/dev/null | grep -q "task_processor.sh"; then
|
|
sudo -u $sudo_user_name crontab -l 2>/dev/null | grep -v "task_processor.sh" | sudo -u $sudo_user_name crontab -
|
|
isNotice "Removed task processor from crontab"
|
|
fi
|
|
|
|
# Reload systemd and enable service
|
|
runSystem systemctl daemon-reload
|
|
runSystem systemctl enable libreportal.service >/dev/null 2>&1
|
|
runSystem systemctl start libreportal.service
|
|
|
|
isSuccessful "LibrePortal task processor service setup."
|
|
fi
|
|
fi
|
|
}
|
|
|
|
# Restart the task processor after a docker-type switch. The processor reads the
|
|
# install type (rooted/rootless) ONCE at startup to decide how runFileOp writes
|
|
# into the docker-install-owned task dir, so a running instance keeps using the
|
|
# old mode until it's bounced. The switch is a CLI one-shot (not a processor
|
|
# task), so this won't kill an in-flight switch.
|
|
restartLibrePortalWebUITaskService()
|
|
{
|
|
[[ "$CFG_REQUIREMENT_WEBUI_SERVICE" == "true" ]] || return 0
|
|
[[ -f /etc/systemd/system/libreportal.service ]] || return 0
|
|
runSystem systemctl restart libreportal.service 2>/dev/null
|
|
isSuccessful "Restarted task processor for $CFG_DOCKER_INSTALL_TYPE Docker mode"
|
|
}
|