From a414f305cc54e19db1400d981da8190026259762 Mon Sep 17 00:00:00 2001
From: Promise Fru <info@promisefru.com>
Date: Thu, 13 Aug 2026 14:27:22 +0100
Subject: [PATCH 1/2] fix: expand PATH variable correctly in su commands

---
 gateway-clients.sh | 2 +-
 manage.sh          | 2 +-
 platforms.sh       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gateway-clients.sh b/gateway-clients.sh
index c1c1811..3fc79b8 100755
--- a/gateway-clients.sh
+++ b/gateway-clients.sh
@@ -127,7 +127,7 @@ run_as_service_user() {
     . '$ENV_FILE'
     set +a
     cd '$INSTALL_DIR'
-    export PATH=\"$VENV_DIR/bin:\$PATH\"
+    export PATH=\"$VENV_DIR/bin:$PATH\"
     $inner_cmd
   "
 
diff --git a/manage.sh b/manage.sh
index 2fbd287..217ee3d 100755
--- a/manage.sh
+++ b/manage.sh
@@ -78,7 +78,7 @@ run_migrations() {
     . '$INSTALL_DIR/.env'
     set +a
     cd '$INSTALL_DIR'
-    PATH='$INSTALL_DIR/venv/bin:\$PATH' make migrate-up
+    PATH='$INSTALL_DIR/venv/bin:$PATH' make migrate-up
   "
 }
 
diff --git a/platforms.sh b/platforms.sh
index e4bf9e4..5ca1b26 100755
--- a/platforms.sh
+++ b/platforms.sh
@@ -126,7 +126,7 @@ run_as_service_user() {
     . '$ENV_FILE'
     set +a
     cd '$INSTALL_DIR'
-    export PATH=\"$VENV_DIR/bin:\$PATH\"
+    export PATH=\"$VENV_DIR/bin:$PATH\"
     $inner_cmd
   "
 

From c34f7fec404948a9afc176a01de383e13dcaef3c Mon Sep 17 00:00:00 2001
From: Promise Fru <info@promisefru.com>
Date: Thu, 13 Aug 2026 14:38:18 +0100
Subject: [PATCH 2/2] fix(celery): only enable heartbeat task when URL is
 configured

---
 tasks/celery_app.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/tasks/celery_app.py b/tasks/celery_app.py
index 7cce1b1..03ea303 100644
--- a/tasks/celery_app.py
+++ b/tasks/celery_app.py
@@ -88,6 +88,19 @@ def make_celery() -> Celery:
     except ValueError as e:
         raise ValueError(f"Invalid CELERY_CLEANUP_CRON '{cleanup_cron}': {e}") from None
 
+    beat_schedule = {
+        "cleanup-stale-payload-sessions": {
+            "task": "tasks.cleanup_task.cleanup_stale_payload_sessions",
+            "schedule": cleanup_schedule,
+        },
+    }
+    if get_configs("UPTIME_KUMA_WORKER_PUSH_URL"):
+        # Uptime Kuma push-monitor heartbeat, see observability/README.md
+        beat_schedule["worker-heartbeat"] = {
+            "task": "tasks.heartbeat_task.ping_worker_heartbeat",
+            "schedule": 60.0,
+        }
+
     app = Celery(
         "relaysms_publisher",
         include=[
@@ -111,17 +124,7 @@ def make_celery() -> Celery:
         worker_log_format=_WORKER_LOG_FORMAT,
         worker_task_log_format=_WORKER_TASK_LOG_FORMAT,
         beat_schedule_filename=schedule_path,
-        beat_schedule={
-            "cleanup-stale-payload-sessions": {
-                "task": "tasks.cleanup_task.cleanup_stale_payload_sessions",
-                "schedule": cleanup_schedule,
-            },
-            # Uptime Kuma push-monitor heartbeat, see observability/README.md
-            "worker-heartbeat": {
-                "task": "tasks.heartbeat_task.ping_worker_heartbeat",
-                "schedule": 60.0,
-            },
-        },
+        beat_schedule=beat_schedule,
     )
     return app