scripts/docker/type_switcher/swap_docker_type.sh

@@ -75,7 +75,7 @@ dockerSwitcherSwap()
                     dockerStartAllApps;
                     databaseOptionInsert "docker_type" $CFG_DOCKER_INSTALL_TYPE;
                     switchMigrateRestoreApps;
-                    installLibrePortalWebUITaskService;
+                    restartLibrePortalWebUITaskService;
                 fi
             fi
         fi
@@ -114,7 +114,7 @@ dockerSwitcherSwap()
                 dockerStartAllApps;
                 databaseOptionInsert "docker_type" $CFG_DOCKER_INSTALL_TYPE;
                 switchMigrateRestoreApps;
-                installLibrePortalWebUITaskService;
+                restartLibrePortalWebUITaskService;
             fi
         fi
     elif [[ $flag == "cli" ]]; then

scripts/webui/webui_install_systemd.sh

@@ -1,23 +1,16 @@
 #!/bin/bash
 
 # LibrePortal Task Processor Systemd Service Setup
-# Replaces crontabSetupTaskProcessor with systemd service.
+# Replaces crontabSetupTaskProcessor with systemd service
-#
-# Idempotent: computes the desired unit for the CURRENT docker mode and only
-# rewrites + daemon-reloads + restarts when it actually differs from what's on
-# disk. So routine re-runs are no-ops (no needless restart that would kill an
-# in-flight task), while a rooted<->rootless switch — which changes the env
-# block — triggers exactly one rewrite + restart so the processor re-reads the
-# new mode. Safe to call from install AND from the docker-type switcher.
 installLibrePortalWebUITaskService() 
 {
-  [[ "$CFG_REQUIREMENT_WEBUI_SERVICE" == "true" ]] || return 0
+  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"
     
-  # Point the processor at the task dir (idempotent).
+    # 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"
@@ -25,13 +18,17 @@ installLibrePortalWebUITaskService()
       isNotice "Task processor script not found"
     fi
 
-  # Rootless docker exposes the daemon at /run/user/<uid>/docker.sock and depends
+  # Rootless docker exposes the daemon at /run/user/<uid>/docker.sock and
-  # on XDG_RUNTIME_DIR being set. Systemd units don't inherit user bashrc, so
+  # depends on XDG_RUNTIME_DIR being set. Systemd units don't inherit user
-  # without these Environment= lines the processor would fall back to
+  # bashrc, so without these Environment= lines the processor would fall
-  # /var/run/docker.sock (which rootless does not create). The rootless daemon
+  # back to /var/run/docker.sock (which rootless does not create) and any
-  # runs as the DOCKER INSTALL USER, so its socket lives in THAT user's runtime
+  # `docker …` call inside the task would fail. Rootful gets no extras —
-  # dir (matches dockerCommandRunInstallUser). Rooted gets no extras — the
+  # the default /var/run path is already correct.
-  # default /var/run path is already correct.
+  #
+  # The rootless daemon runs as the DOCKER INSTALL USER, so its socket lives in
+  # that user's runtime dir — not the manager's. Use the docker install user's
+  # uid here (matches dockerCommandRunInstallUser); pointing at the manager's
+  # uid was wrong — that socket doesn't exist.
   local service_env_block=""
   if [[ "$CFG_DOCKER_INSTALL_TYPE" == "rootless" ]]; then
     local docker_install_uid
@@ -40,8 +37,8 @@ installLibrePortalWebUITaskService()
 Environment=XDG_RUNTIME_DIR=/run/user/${docker_install_uid}"
   fi
 
-  local desired
+  # Create systemd service file
-  desired="$(cat <<EOF
+  runSystem tee "$service_file" > /dev/null <<EOF
 [Unit]
 Description=LibrePortal Task Processor
 After=network.target
@@ -64,27 +61,32 @@ PrivateTmp=true
 [Install]
 WantedBy=multi-user.target
 EOF
-)"
 
-  local current=""
+      # Remove from crontab if it exists
-  [[ -f "$service_file" ]] && current="$(sudo cat "$service_file" 2>/dev/null)"
+      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 -
-  if [[ "$desired" != "$current" ]]; then
-    printf '%s\n' "$desired" | runSystem tee "$service_file" > /dev/null
-    runSystem systemctl daemon-reload
-    runSystem systemctl enable libreportal.service >/dev/null 2>&1
-    runSystem systemctl restart libreportal.service
-    isSuccessful "LibrePortal task processor service installed/updated ($CFG_DOCKER_INSTALL_TYPE)."
-  else
-    # Unit already correct — ensure it's enabled + running, without a restart.
-    runSystem systemctl enable libreportal.service >/dev/null 2>&1
-    sudo systemctl is-active --quiet libreportal.service || runSystem systemctl start libreportal.service
-    isSuccessful "LibrePortal task processor service already up to date."
-  fi
-
-  # Drop the legacy crontab entry if present (superseded by the service).
-  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"
 }