From 7c38ffff5753d3851af6162f7b888c5f307b29eb Mon Sep 17 00:00:00 2001 From: test Date: Sun, 30 Aug 2026 09:28:44 +0200 Subject: [PATCH] Finalize Supervisor-owned SSR deployment --- deploy/supervisor/skinbase-ssr.conf | 5 +++-- scripts/_probe_ssr.sh | 21 --------------------- 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 scripts/_probe_ssr.sh diff --git a/deploy/supervisor/skinbase-ssr.conf b/deploy/supervisor/skinbase-ssr.conf index 4429fde5..579e72b6 100644 --- a/deploy/supervisor/skinbase-ssr.conf +++ b/deploy/supervisor/skinbase-ssr.conf @@ -4,9 +4,10 @@ ; sudo supervisorctl start skinbase-ssr ; ; Path uses the stable app symlink (REMOTE_FOLDER), not a versioned release dir. -; Override node path if needed. Deploy restarts this via SSR_SUPERVISOR_PROGRAM=skinbase-ssr. +; Supervisor has a minimal PATH, so call node by absolute path. Deploy restarts +; this as the SSH login user via: sudo -n supervisorctl restart skinbase-ssr [program:skinbase-ssr] -command=/usr/bin/env node /opt/www/virtual/SkinbaseNova/bootstrap/ssr/ssr.js +command=/usr/local/bin/node /opt/www/virtual/SkinbaseNova/bootstrap/ssr/ssr.js directory=/opt/www/virtual/SkinbaseNova process_name=%(program_name)s numprocs=1 diff --git a/scripts/_probe_ssr.sh b/scripts/_probe_ssr.sh deleted file mode 100644 index c7986dfc..00000000 --- a/scripts/_probe_ssr.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -set +e -ssh_bin=ssh -remote_server=klevze@server3.klevze.si -key=/tmp/skinbase-deploy-ssh/identities/id_ed25519 -opts=(-o BatchMode=yes -o StrictHostKeyChecking=accept-new -o ConnectTimeout=15 -o IdentitiesOnly=yes) -if [[ -S /tmp/skinbase-deploy-ssh/mux-klevze_server3.klevze.si.sock ]]; then - opts+=(-o ControlPath=/tmp/skinbase-deploy-ssh/mux-klevze_server3.klevze.si.sock) -fi -if [[ -f "$key" ]]; then - opts+=(-i "$key") -fi - -"$ssh_bin" "${opts[@]}" "$remote_server" 'sudo -n -l' -echo EXIT:$? -echo '--- ps ---' -"$ssh_bin" "${opts[@]}" "$remote_server" "ps -ef | grep -E 'ssr|inertia|supervisor' | grep -v grep" -echo '--- status ---' -"$ssh_bin" "${opts[@]}" "$remote_server" 'sudo -n /usr/bin/supervisorctl status' -echo '--- restart ---' -"$ssh_bin" "${opts[@]}" "$remote_server" 'sudo -n /usr/bin/supervisorctl restart skinbase-ssr; echo rc=$?'