Merge pull request #39 from coderbuzz/feat/cleanup-old-server-on-app-move

feat: cleanup old server when app is moved to a different server

Author: coderbuzz

internal/app/handler.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/url"
 	"sort"
 	"strconv"
 	"strings"
@@ -573,6 +574,7 @@ func (h *WebHandler) AppEditForm(w http.ResponseWriter, r *http.Request, render
 		render(w, r, http.StatusNotFound, "error.html", map[string]interface{}{"Message": "app not found"})
 		return
 	}
+	oldServerID := app.ServerID
 	if err := r.ParseForm(); err != nil {
 		servers, _ := h.serverRepo.List()
 		render(w, r, http.StatusBadRequest, "apps_add.html", map[string]interface{}{
@@ -655,6 +657,28 @@ func (h *WebHandler) AppEditForm(w http.ResponseWriter, r *http.Request, render
 		return
 	}
 
+	var flashMsg string
+	if oldServerID != 0 && oldServerID != serverID {
+		oldServerName := fmt.Sprintf("#%d", oldServerID)
+		newServerName := fmt.Sprintf("#%d", serverID)
+		if servers, err := h.serverRepo.List(); err == nil {
+			for _, s := range servers {
+				if s.ID == oldServerID {
+					oldServerName = s.Name
+				}
+				if s.ID == serverID {
+					newServerName = s.Name
+				}
+			}
+		}
+		h.service.DeleteRoutes(app.ID)
+		go h.service.CleanupFromServer(id, oldServerID)
+		flashMsg = url.QueryEscape(fmt.Sprintf(
+			"App moved from %s to %s. Containers stopped on %s, but app folder remains — check and delete manually if no longer needed.",
+			oldServerName, newServerName, oldServerName,
+		))
+	}
+
 	saveFormSecrets(r, h.service, id)
 	saveFormFiles(r, h.service, id)
 
@@ -704,7 +728,11 @@ func (h *WebHandler) AppEditForm(w http.ResponseWriter, r *http.Request, render
 
 	go h.service.Redeploy(id, removedDomains...)
 
-	http.Redirect(w, r, "/apps/"+strconv.FormatInt(id, 10), http.StatusSeeOther)
+	redirectURL := "/apps/" + strconv.FormatInt(id, 10)
+	if flashMsg != "" {
+		redirectURL += "?flash=" + flashMsg
+	}
+	http.Redirect(w, r, redirectURL, http.StatusSeeOther)
 }
 
 func (h *WebHandler) AppDetailPage(w http.ResponseWriter, r *http.Request, render RenderFunc) {
@@ -759,6 +787,7 @@ func (h *WebHandler) AppDetailPage(w http.ResponseWriter, r *http.Request, rende
 		"Files":            files,
 		"Routes":           routes,
 		"Domains":          domains,
+		"Flash":            r.URL.Query().Get("flash"),
 		"DomainCount":      len(domains),
 		"ExtraDomainCount": len(domains) - 1,
 	})

internal/app/service.go

@@ -96,6 +96,10 @@ func (s *Service) Delete(id int64) error {
 	return s.repo.Delete(id)
 }
 
+func (s *Service) DeleteRoutes(appID int64) error {
+	return s.repo.DeleteRoutes(appID)
+}
+
 func (s *Service) SaveRoute(route *Route) error {
 	return s.repo.SaveRoute(route)
 }
@@ -343,6 +347,49 @@ func (s *Service) Undeploy(id int64) error {
 	return nil
 }
 
+// CleanupFromServer stops containers and removes Caddy routes from a server
+// without deleting the app folder or DB rows. Used when moving an app to
+// a different server.
+func (s *Service) CleanupFromServer(appID, serverID int64) {
+	app, err := s.repo.Get(appID)
+	if err != nil || app == nil {
+		log.Printf("CleanupFromServer: app %d not found", appID)
+		return
+	}
+
+	svr, err := s.serverRepo.Get(serverID)
+	if err != nil || svr == nil {
+		log.Printf("CleanupFromServer %q: server %d not found, skipping", app.Name, serverID)
+		return
+	}
+
+	client, err := s.connFactory(svr.Host, svr.Port, svr.User, svr.SSHKey)
+	if err != nil {
+		log.Printf("CleanupFromServer %q: SSH connect to %s failed, skipping: %v", app.Name, svr.Name, err)
+		return
+	}
+	defer client.Close()
+
+	dc := DockerComposeCmd(client)
+	remoteDir := fmt.Sprintf("/opt/dockify/apps/app-%d", app.ID)
+	composePath := fmt.Sprintf("%s/docker-compose.yml", remoteDir)
+
+	log.Printf("Cleaning up %q from %s (containers stopped, folder kept)...", app.Name, svr.Name)
+
+	client.Exec(fmt.Sprintf("%s -f %s down 2>&1 || true", dc, composePath))
+
+	routes, _ := s.repo.GetRoutes(app.ID)
+	for _, r := range routes {
+		caddyClient := caddy.NewClient(client)
+		caddyClient.RemoveRoute(r.Domain)
+	}
+	if len(routes) > 0 {
+		caddy.NewClient(client).SaveConfig()
+	}
+
+	log.Printf("App %q cleaned up from %s (folder preserved at %s)", app.Name, svr.Name, remoteDir)
+}
+
 func (s *Service) setupRouteAndDNSForDomain(route Route, app *App, svr *server.Server, client ssh.Connector, composeContent string, logs *[]string) {
 	target := fmt.Sprintf("%s:%d", getServiceName(composeContent), app.Port)
 	caddyClient := caddy.NewClient(client)

internal/caddy/client.go

@@ -77,7 +77,7 @@ func (c *Client) AddRouteWithAuth(domain, target, user, pass string) error {
 }
 
 func (c *Client) postRoute(route Route) error {
-	// Hapus route lama dengan ID yang sama (kalau ada, ignore error)
+	// Remove old route with same ID (if any, ignore error)
 	c.ssh.Exec(fmt.Sprintf(
 		`docker exec caddy curl -s -o /dev/null -X DELETE http://localhost:2019/id/%s`,
 		route.ID,
@@ -88,8 +88,8 @@ func (c *Client) postRoute(route Route) error {
 		return fmt.Errorf("marshal route: %w", err)
 	}
 
-	// Pastikan routes array ada (bisa null di Caddy fresh). POST [] hanya
-	// berhasil kalau routes null; kalau sudah ada, gagal harmless tanpa side effect.
+	// Ensure routes array exists (may be null on fresh Caddy). POST [] only
+	// succeeds if routes is null; if already populated, fails harmlessly.
 	c.ssh.Exec(`docker exec caddy curl -s -o /dev/null -X POST http://localhost:2019/config/apps/http/servers/srv0/routes -H 'Content-Type: application/json' -d '[]'`)
 
 	cmd := fmt.Sprintf(

internal/db/db.go

@@ -36,17 +36,17 @@ func Open(path string) (*sql.DB, error) {
 		return nil, fmt.Errorf("migrate: %w", err)
 	}
 
-	// Migrasi: hapus kolom webhook_secret dari apps (global settings sekarang)
+	// Migration: drop webhook_secret column from apps (global settings now)
 	db.Exec("ALTER TABLE apps DROP COLUMN webhook_secret")
 
-	// Migrasi: tambah kolom disk_usage (v0.4.0)
+	// Migration: add disk_usage column (v0.4.0)
 	db.Exec("ALTER TABLE servers ADD COLUMN disk_usage REAL")
 	db.Exec("ALTER TABLE servers ADD COLUMN resources_updated_at DATETIME")
 
-	// Migrasi: tambah kolom unique_service_name (v0.3.0)
+	// Migration: add unique_service_name column (v0.3.0)
 	db.Exec("ALTER TABLE apps ADD COLUMN unique_service_name INTEGER DEFAULT 0")
 
-	// Migrasi: tambah kolom compose_mode, gantikan unique_service_name (v0.5.0)
+	// Migration: add compose_mode column, replaces unique_service_name (v0.5.0)
 	db.Exec("ALTER TABLE apps ADD COLUMN compose_mode TEXT DEFAULT 'advanced'")
 	db.Exec("UPDATE apps SET compose_mode = 'simple' WHERE unique_service_name = 1")
 

internal/http/templates/apps_detail.html

@@ -4,6 +4,7 @@
 <body>
 {{template "nav" .}}
 <div class="container">
+  {{if .Flash}}<div class="flash-banner">{{.Flash}}</div>{{end}}
   <div class="breadcrumb">
     <a href="apps">Apps</a>
     <span>/</span>

internal/http/templates/layout.html

@@ -280,6 +280,17 @@
   text-transform: uppercase;
 }
 
+/* Flash messages */
+.flash-banner {
+  background: var(--blue);
+  color: #fff;
+  padding: 0.6em 1em;
+  border-radius: 4px;
+  margin-bottom: 1em;
+  font-size: 0.85em;
+  line-height: 1.4;
+}
+
 @media (max-width: 600px) {
   .container { padding: 0.8em 1em; }
   .grid { grid-template-columns: 1fr; }