'Generic Commit'

gitea-runner/config/service.env

@@ -8,3 +8,7 @@ GITEA_URL="https://gitea.jde.nz"
 GITEA_TOKEN="GITEA_TOKEN"
 GITEA_RUNNER_NAME="${SERVER}-${SERVICE}"
 GITEA_RUNNER_LABELS="ubuntu-latest:docker://node:16-bullseye,ubuntu-22.04:docker://node:16-bullseye,ubuntu-20.04:docker://node:16-bullseye,ubuntu-18.04:docker://node:16-buster"
+
+# Server Settings
+SSH_USER="dropshell"
+

gitea-runner/destroy.sh

@@ -7,4 +7,4 @@ _check_required_env_vars "SERVER" "SERVICE" "GITEA_RUNNER_DIRECTORY"
 # Call uninstall script first
 ./uninstall.sh
 
-echo "Destroyed ${CONTAINER_NAME}."
+echo "Destroyed ${SERVICE}"

gitea-runner/start.sh

@@ -13,6 +13,6 @@ CONFIG_FILE="${GITEA_RUNNER_DIRECTORY}/config.yaml"
 
 "${GITEA_RUNNER_DIRECTORY}/act_runner" daemon --config "${CONFIG_FILE}" || _die "Failed to start act_runner"
 
-echo "act_runner started"
+echo "Started $SERVICE"
 
 

gitea-runner/stop.sh

@@ -5,12 +5,11 @@ source "${AGENT_PATH}/common.sh"
 _check_required_env_vars "SERVER" "SERVICE" "GITEA_RUNNER_DIRECTORY"
 
 # kill the act_runner process
-pkill -f "${GITEA_RUNNER_DIRECTORY}/act_runner"
-
-echo "act_runner stopped"
-
-
-
-
-
+if pgrep -f "${GITEA_RUNNER_DIRECTORY}/act_runner" > /dev/null; then
+    pkill -f "${GITEA_RUNNER_DIRECTORY}/act_runner"
+    echo "act_runner stopped"
+else
+    echo "act_runner is not running"
+fi
 
+echo "Stopped $SERVICE"

gitea-runner/uninstall.sh

@@ -11,5 +11,4 @@ echo "Uninstalling service ${SERVICE}..."
 rm -rf "${GITEA_RUNNER_DIRECTORY}"
 
 
-echo "Service ${SERVICE} uninstalled."
-echo "Note: This does NOT remove the local data folder. Use destroy for that."
+echo "Uninstalled ${SERVICE}"