From 96e63ded248a5f2056071ac6c860f2e4156305a0 Mon Sep 17 00:00:00 2001
From: Nick Goodall <nbgoodall@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:18 +0000
Subject: [PATCH] single restart on deploy

---
 main.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/main.go b/main.go
index a3352f2..07beffb 100644
--- a/main.go
+++ b/main.go
@@ -1047,7 +1047,7 @@ func runSetup() error {
 	defer closeSSHControlMaster(ctx.serverIP)
 	start := time.Now()
 
-	if err := performSetup(ctx); err != nil {
+	if err := performSetup(ctx, true); err != nil {
 		return err
 	}
 
@@ -1056,7 +1056,7 @@ func runSetup() error {
 	return nil
 }
 
-func performSetup(ctx *deploymentContext) error {
+func performSetup(ctx *deploymentContext, restart bool) error {
 	step := 1
 	printStep(step, totalSetupSteps, "validating configuration")
 	remoteOS, err := runSSHOutput(ctx.serverIP, "uname -s")
@@ -1103,6 +1103,12 @@ func performSetup(ctx *deploymentContext) error {
 		return fmt.Errorf("systemd override failed: %w", err)
 	}
 
+	if restart {
+		if err := restartPocketBaseService(ctx); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -1131,7 +1137,7 @@ func runDeploy() error {
 		if prompted {
 			start = time.Now()
 		}
-		if err := performSetup(ctx); err != nil {
+		if err := performSetup(ctx, false); err != nil {
 			return err
 		}
 	}
@@ -1793,9 +1799,8 @@ ExecStart        = %s/pocketbase serve --http=127.0.0.1:${PORT} --dir=${DATA_DIR
 WantedBy = multi-user.target
 EOF
 	systemctl daemon-reload
-	systemctl --no-block enable --now pb@%s
-	systemctl --no-block restart pb@%s
-`, serviceDir, serviceDir, serviceDir, envFile, serviceDir, serviceDir, serviceDir, serviceDir, serviceName, serviceName)
+	systemctl --no-block enable pb@%s
+`, serviceDir, serviceDir, serviceDir, envFile, serviceDir, serviceDir, serviceDir, serviceDir, serviceName)
 }
 
 func systemdOverrideScript(serviceName string, port int, volume string) string {
@@ -1808,8 +1813,7 @@ Environment=PORT=%d
 Environment=DATA_DIR=%s
 EOF
 systemctl daemon-reload
-systemctl --no-block restart pb@%s
-`, serviceName, port, volume, serviceName)
+`, serviceName, port, volume)
 }
 
 func systemdRestartScript(serviceName string) string {