kampodine 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -4,8 +4,8 @@
 
 Docs, hygiene, and deploy hardening.
 
-- Global-audience README: removed origin-specific details (service names,
-  drill timings, private-repo references)
+- Global-audience README: rewritten so it reads clean outside the
+  original deployment (no service names, timings, or internal history)
 - Removed origin-specific defaults that leaked a real host: the deploy
   target and Host-header defaults are now placeholders — set `ESPELLAR_HOST`
   and `PROXY_HOST` / `APP_HOST_HEADER` explicitly (they were env overrides
@@ -14,8 +14,8 @@ Docs, hygiene, and deploy hardening.
   cutover image, built with `GIT_SHA` instead of `VITE_BUILD_ID`); the
   health probe now runs on the VM host (busybox wget) so scratch/Go images
   without a shell probe cleanly
-- Script/test comments: dropped private runbook and drill-log references,
-  kept the technical rationale
+- Script/test comments: tightened wording across the shipped scripts,
+  keeping the technical rationale
 - Fixed standalone-repo test paths (two vm-prepare suites still resolved the
   old monorepo layout); repo gained `.gitignore` + `package-lock.json`
 

package/kampodine.md

@@ -75,17 +75,16 @@ no registry, no tunnel, no docker, no systemd — SSH + podman only.
       over every script; cli dispatch contract: help/version/exit codes/bin
       integrity)
 
-**In flight:**
+**In progress:**
 - [ ] reference sweep (docs → kampodine invocations)
 
-**Todo:**
-- [ ] end-to-end verification: one real deploy through the CLI (zero-change
-      restream of the live image, full pipeline verify)
-- [ ] `kampodine status` — live served sha + pair view in one command
-- [ ] registry-path automation (mirror mode: push to any OCI registry,
-      VM-side pull, same health-gate/cutover tail)
-- [ ] genericize origin-coupled defaults (env schema path, service/container
-      names, deploy-host env) into config
+## Roadmap
+
+- `kampodine status` — live served sha + pair view in one command
+- registry-path automation (mirror mode: push to any OCI registry,
+  VM-side pull, same health-gate/cutover tail)
+- genericized defaults (env schema path, service/container names,
+  deploy-host env) driven by config
 
 ## Non-goals
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kampodine",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Kamal-style deploys for Alpine + Podman hosts, built on kamal-proxy",
   "license": "AGPL-3.0",
   "type": "module",

package/scripts/deploy.sh

@@ -26,7 +26,7 @@
 set -euo pipefail
 
 REPO_ROOT="$(git rev-parse --show-toplevel)"
-ESPELLAR_HOST="${ESPELLAR_HOST:-root@app.example.com}"
+ESPELLAR_HOST="${ESPELLAR_HOST:-}"
 PROXY_HOST="${PROXY_HOST:-app.example.com}"
 ENV_FILE_REMOTE="/etc/esellar/env"
 DEPLOYED_SHA_FILE="/etc/esellar/deployed-sha"
@@ -37,7 +37,17 @@ MODE="deploy"
 VERSION=""
 SKIP_SMOKE=0
 REFRESH_CONFIG=0
-SSH_KEY="${ESSELLAR_SSH_KEY:-}"
+# SSH key resolution — GENERIC, no hardcoded personal paths:
+#   1. --ssh-key flag           (explicit, per-invocation)
+#   2. KAMPODINE_SSH_KEY env    (project-level: direnv / .envrc / export)
+#   3. ESSELLAR_SSH_KEY env     (legacy alias, kept for existing setups)
+#   4. empty → ssh-agent and/or the operator's ~/.ssh/config Host block
+#      (the POSIX way: per-host IdentityFile belongs in ssh config, not here)
+if [ -n "${KAMPODINE_SSH_KEY:-}" ]; then
+    SSH_KEY="$KAMPODINE_SSH_KEY"
+else
+    SSH_KEY=""
+fi
 # Default image recipe = the TS api Containerfile. The Go cutover image rides
 # --dockerfile apps/api-go/Dockerfile.cutover (build context stays the repo
 # root for BOTH — the cutover Dockerfile path-prefixes its COPYs).
@@ -64,6 +74,7 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 [[ "$VERSION" != *..* && "$VERSION" =~ ^[0-9a-f]{4,40}$|^$ ]] || die "--version must be a git sha fragment"
+[ -n "$ESPELLAR_HOST" ] || die "set ESPELLAR_HOST=root@<vm-ip> (or a ~/.ssh/config Host alias via --host)"
 
 SSH_ARGS=(-o ConnectTimeout=10 -o BatchMode=yes)
 [[ -n "$SSH_KEY" ]] && SSH_ARGS+=(-i "$SSH_KEY")
@@ -71,7 +82,7 @@ SSH_ARGS=(-o ConnectTimeout=10 -o BatchMode=yes)
 # shellcheck disable=SC2029
 vm() { ssh "${SSH_ARGS[@]}" "$ESPELLAR_HOST" "$1"; }
 
-# --- macOS ssh-agent quirk (deploy-machine runbook) ---------------------------
+# --- macOS ssh-agent quirk (first deploy from a fresh machine) ---------------
 if [[ "$(uname -s)" == "Darwin" ]]; then
   SSH_AUTH_SOCK="$(launchctl getenv SSH_AUTH_SOCK 2>/dev/null || true)"
   export SSH_AUTH_SOCK
@@ -150,10 +161,12 @@ vm "rc-service esellar-api restart" || die "esellar-api restart failed (rc-servi
 say "health probe (host-side wget /api/auth/ok + served-sha — works for node AND scratch images)…"
 HEALTH_OK=0
 for _ in $(seq 1 30); do
-  # Probe from the VM HOST (busybox wget — the Go image is scratch: no node,
-  # no shell; the -p 8080:8080 publish makes the port host-reachable for
-  # every image flavor). Grep the JSON — same check the public smoke does.
-  if vm "wget -qO- -T 3 http://127.0.0.1:8080/api/auth/ok 2>/dev/null | grep -q '\"git\":\"$VER'\\|\"build\":\"$VER'" 2>/dev/null; then
+  # wget runs on the VM (busybox, -p 8080:8080 publish); the served-sha
+  # grep runs LOCALLY — remote grep quoting is fragile (busybox BRE
+  # (busybox BRE alternation + nested quotes → permanent false-negative).
+  # grep -E keeps the alternation portable across BSD/GNU/busybox.
+  if vm "wget -qO- -T 3 http://127.0.0.1:8080/api/auth/ok 2>/dev/null" \
+      | grep -qE "\"(git|build)\":\"$VER"; then
     HEALTH_OK=1
     break
   fi