@stacksjs/buddy 0.70.197 → 0.70.199

package/dist/commands/deploy.d.ts

@@ -84,6 +84,7 @@ export declare function scrubLoopbackSitePortsForFirewall(tsCloudConfig: any): a
  * does not provide `config/email.ts`.
  */
 export declare function hasExplicitEmailConfig(projectRoot?: unknown): boolean;
+export declare function mailServerOwnerFromConfig(config: any): string | undefined;
 /**
  * Everything is MERGE-based so a shared mail server keeps every other tenant's
  * domains, keys, users, and forward rules untouched. Best-effort — a hiccup is

package/dist/commands/deploy.js

@@ -819,9 +819,23 @@ async function runHetznerDeploy(args) {
   if (ok)
     await reconcileConfigDns(onlySite ? { [onlySite]: sites[onlySite] } : sites, log);
   if (ok) {
-    const mailRes = await provisionMailTenant(ip, log);
+    const mailOwner = mailServerOwnerFromConfig(emailConfig);
+    let mailIp = ip;
+    if (mailOwner) {
+      const mailBox = await resolveAttachTargetBox(mailOwner, environment);
+      if (mailBox?.publicIp) {
+        mailIp = mailBox.publicIp;
+        log.info(`Mail: reconciling on '${mailOwner}' box '${mailBox.serverName}' (${mailIp})`);
+      } else {
+        mailIp = void 0;
+        log.warn(`Mail: attach target '${mailOwner}' has no reachable '${environment}' box; application deploy remains live`);
+      }
+    }
+    const mailRes = mailIp ? await provisionMailTenant(mailIp, log) : null;
+    if (mailOwner && mailIp && mailIp !== ip)
+      await cleanupDetachedMailHealth(ip, log);
     if (mailRes)
-      await reconcileMailDns(mailRes, ip, log);
+      await reconcileMailDns(mailRes, mailIp, log);
   }
   for (const record of githubDeployments)
     await setGithubDeploymentStatus(record, ok ? "success" : "failure");
@@ -861,6 +875,34 @@ function resolveMailboxes(mailboxes, domain) {
 export function hasExplicitEmailConfig(projectRoot = p.projectPath()) {
   return existsSync(join(projectRoot, "config", "email.ts"));
 }
+export function mailServerOwnerFromConfig(config) {
+  const owner = config?.server?.attachTo;
+  return typeof owner === "string" && owner.trim() ? owner.trim() : void 0;
+}
+async function cleanupDetachedMailHealth(ip, logger) {
+  const { execSync } = await import("node:child_process"), sshArgs = ["-o", "StrictHostKeyChecking=accept-new", "-o", "BatchMode=yes", "-o", "ConnectTimeout=20", `root@${ip}`], script = `set -e
+if systemctl list-unit-files --type=service --no-legend | awk '{print $1}' | grep -qx mail.service; then
+  exit 0
+fi
+systemctl disable --now mail-health.timer >/dev/null 2>&1 || true
+systemctl stop mail-health.service >/dev/null 2>&1 || true
+systemctl reset-failed mail-health.service >/dev/null 2>&1 || true
+rm -f /etc/systemd/system/mail-health.service /etc/systemd/system/mail-health.timer
+rm -f /usr/local/sbin/mail-health-check /etc/systemd/system/mail.service.d/reliability.conf
+rmdir /etc/systemd/system/mail.service.d 2>/dev/null || true
+systemctl daemon-reload
+systemctl reset-failed`;
+  try {
+    execSync(`ssh ${sshArgs.map((a) => `'${a}'`).join(" ")} bash -s`, {
+      input: script,
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    logger.success("Mail: removed the detached health timer from the application box");
+  } catch (err) {
+    logger.warn(`Mail: could not remove the detached health timer: ${getErrorMessage(err)}`);
+  }
+}
 async function resolveAttachTargetBox(owner, environment) {
   const token = process.env.HCLOUD_TOKEN;
   if (!token)

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/buddy",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.197",
+  "version": "0.70.199",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "contributors": [
@@ -137,7 +137,7 @@
     "@stacksjs/ui": "^0.70.180",
     "@stacksjs/utils": "^0.70.180",
     "@stacksjs/validation": "^0.70.180",
-    "@stacksjs/ts-cloud": "^0.7.79",
+    "@stacksjs/ts-cloud": "^0.7.82",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1"
   },