From 773000a42a47931ce1e412fe079725cd12d8ad6b Mon Sep 17 00:00:00 2001 From: "dong.nguyen" Date: Fri, 23 Oct 2026 23:45:39 +0700 Subject: [PATCH] fix(ci): drop -R from infra rsync; per-step remote_path (action prefixes GITHUB_WORKSPACE) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Run 2026-10-23 shipped files to dong-site/workspace/dong.nguyen/cv/… on the VPS: the action builds the rsync source as "/" (entrypoint.sh) and -R mirrors that absolute path; deploy/htpasswd also landed as a directory. Each step now uses plain -avz with an explicit remote_path (dong-site/ for nginx.conf + compose.yaml, dong-site/deploy/ for htpasswd). Spec §4 sketch/notes resolved, §8 rows 2/4 record both run outcomes and the owner-side VPS cleanup before the next dispatch. --- .gitea/workflows/deploy-infra.yml | 20 ++++++++++---------- docs/design/specs/v4/spec-v4-deploy-infra.md | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/deploy-infra.yml b/.gitea/workflows/deploy-infra.yml index a937d7b..5084a13 100644 --- a/.gitea/workflows/deploy-infra.yml +++ b/.gitea/workflows/deploy-infra.yml @@ -23,16 +23,16 @@ jobs: steps: - uses: actions/checkout@v7 - # Ship exactly the three triggered files; -R keeps deploy/htpasswd under - # deploy/ in the stack directory. Never .env, never secrets/ (D6). - # The action passes `path` to rsync as ONE quoted argument — a comma list - # reaches rsync as a single literal filename (first real run 2026-10-23: - # link_stat "nginx.conf,compose.yaml,deploy/htpasswd" failed). One step - # per file = the spec §4 fallback. + # Ship exactly the three triggered files. Never .env, never secrets/ (D6). + # The action builds the rsync source as "$GITHUB_WORKSPACE/$path" and passes + # it as one argument (entrypoint.sh) — so NO --relative: -R mirrors the whole + # absolute workspace path onto the server (run 2026-10-23 created + # dong-site/workspace/dong.nguyen/cv/… on the VPS). Plain -avz lands each + # file's basename in remote_path; the htpasswd step names deploy/ itself. - name: Sync nginx.conf uses: burnett01/rsync-deployments@v9 with: - switches: -avzR + switches: -avz path: nginx.conf remote_path: /opt/stacks/dong-site/ remote_host: ${{ secrets.DEPLOY_HOST }} @@ -42,7 +42,7 @@ jobs: - name: Sync compose.yaml uses: burnett01/rsync-deployments@v9 with: - switches: -avzR + switches: -avz path: compose.yaml remote_path: /opt/stacks/dong-site/ remote_host: ${{ secrets.DEPLOY_HOST }} @@ -52,9 +52,9 @@ jobs: - name: Sync deploy/htpasswd uses: burnett01/rsync-deployments@v9 with: - switches: -avzR + switches: -avz path: deploy/htpasswd - remote_path: /opt/stacks/dong-site/ + remote_path: /opt/stacks/dong-site/deploy/ remote_host: ${{ secrets.DEPLOY_HOST }} remote_port: ${{ secrets.DEPLOY_SSH_PORT }} remote_user: ${{ secrets.DEPLOY_USER }} diff --git a/docs/design/specs/v4/spec-v4-deploy-infra.md b/docs/design/specs/v4/spec-v4-deploy-infra.md index 46922bc..ee8ca26 100644 --- a/docs/design/specs/v4/spec-v4-deploy-infra.md +++ b/docs/design/specs/v4/spec-v4-deploy-infra.md @@ -51,10 +51,10 @@ jobs: redeploy: steps: 1 actions/checkout - 2 burnett01/rsync-deployments x3 — switches: -avzR (no --delete; -R keeps deploy/htpasswd under deploy/) + 2 burnett01/rsync-deployments x3 — switches: -avz (no --delete, no -R) path: nginx.conf / compose.yaml / deploy/htpasswd — one step per file - (rev.: the action passes `path` as ONE quoted argument; the comma list reached rsync as a single literal filename — verified on the first real run 2026-10-23) - remote_path: /dong-site/ (existing DEPLOY_* secrets) + remote_path: /dong-site/ for the first two, /dong-site/deploy/ for htpasswd (existing DEPLOY_* secrets) + (The action builds the rsync source as "$GITHUB_WORKSPACE/$path" and passes it as one argument — entrypoint.sh. A comma-list therefore fails as one literal filename, and --relative/-R mirrors the absolute workspace path onto the server; both proven on the 2026-10-23 runs.) 3 appleboy/ssh-action — script: cd /dong-site docker run --rm \ @@ -74,7 +74,7 @@ jobs: ``` Notes: -- The test container renders the template with **pure placeholders on the command line** — `nginx -t` validates syntax only, and `proxy_pass http://placeholder/…` is valid syntax (a literal host needs no resolver check at `-t`). It mounts the template and the htpasswd file (`-t` opens `auth_basic_user_file`); it reads no config file and no secrets: the real values never enter the test container or the job. [Resolved 2026-10-23 on the first real run: the rsync action's comma-separated `path` input reaches rsync as ONE quoted literal filename (`link_stat "nginx.conf,compose.yaml,deploy/htpasswd"` failed); the workflow now uses the fallback — three single-path steps.] +- The test container renders the template with **pure placeholders on the command line** — `nginx -t` validates syntax only, and `proxy_pass http://placeholder/…` is valid syntax (a literal host needs no resolver check at `-t`). It mounts the template and the htpasswd file (`-t` opens `auth_basic_user_file`); it reads no config file and no secrets: the real values never enter the test container or the job. [Resolved on the 2026-10-23 runs: (1) the comma-separated `path` input reaches rsync as ONE quoted literal filename (`link_stat "nginx.conf,compose.yaml,deploy/htpasswd"` failed) → three single-path steps; (2) the action prepends `$GITHUB_WORKSPACE` to `path` (`LOCAL_PATH="$GITHUB_WORKSPACE/$INPUT_PATH"`), so `-R` mirrored the absolute workspace path — a `workspace/dong.nguyen/cv/…` tree appeared on the VPS → the workflow uses plain `-avz` with a per-step `remote_path` instead.] - The health probe uses `wget` (busybox) because `nginx:alpine` carries no curl. - Restart gap is ~1–2 s (single container). Accepted for a personal site; a two-container swap is explicitly out of scope. - `on.push.paths` is evaluated by the act runner — assumed supported on this Gitea [INFERENCE: verify on the first real run — the first run did execute after the push that touched the three files; confirm the trigger event label in the Actions UI to close this]. Fallback if the filter is ignored: a first step that diffs `$GITHUB_BASE_REF..$GITHUB_SHA` (or the head commit) against the trigger paths and exits early. @@ -166,9 +166,9 @@ GITEA_CONTENTS_API=https:///api/v1/repos///contents/ | 0 | Design agreed (D1–D9, rev.3 owner facts confirmed) | ✅ Done 2026-10-23 | | 1 | Owner-side confirmations: stack path `/opt/stacks` ✅, upstream Dockge ✅, stack-file name `compose.yaml` ✅ (all confirmed 2026-10-23); remaining: stack-vs-repo drift diff (§6) | 🟡 TODO — drift diff blocks the first run | | 1b | Rename `docker-compose.yaml` → `compose.yaml` (D9) + AGENTS.md references | ✅ Done 2026-10-23 — `git mv`; `docker compose config --quiet` validates (only the expected local `GITEA_TOKEN`-unset warning) | -| 2 | `.gitea/workflows/deploy-infra.yml` per §4 | ✅ Done 2026-10-23 — checkout → three single-path rsync steps (-avzR) → test container (placeholders + htpasswd mount) → recreate + wget/nginx -t probe; appleboy/ssh-action pinned v1.2.0. First-run fix 2026-10-23: the original comma-list `path` failed (action passes it as one quoted argument) — §4 fallback applied | +| 2 | `.gitea/workflows/deploy-infra.yml` per §4 | ✅ Done 2026-10-23 — checkout → three single-path rsync steps (-avz, per-step remote_path; htpasswd → …/dong-site/deploy/) → test container (placeholders + htpasswd mount) → recreate + wget/nginx -t probe; appleboy/ssh-action pinned v1.2.0. Run fixes 2026-10-23: comma-list `path` failed (single quoted argument) → three steps; `-R` + the action's workspace-prefixed source mirrored `workspace/dong.nguyen/cv/…` onto the VPS → `-R` dropped | | 3 | Restricted Gitea token `site-contents-write` (Contents write, expiry) + create stack `secrets/site_config` (chmod 600, two KEY=value lines) | ⬜ TODO — owner-side | -| 4 | First verified run + acceptance §7 | 🟡 First run 2026-10-23 failed at the rsync step (comma-list `path` → single literal filename), nothing shipped, live container untouched; fixed with the three-step fallback — re-run via `workflow_dispatch` after the fix lands | +| 4 | First verified run + acceptance §7 | 🟡 Runs 2026-10-23: run 1 failed at rsync (comma-list), nothing shipped; run 2 shipped to the wrong places (workspace mirror; `deploy/htpasswd` landed as a directory). Both causes fixed in the workflow. Owner-side before the next dispatch: delete the stray `workspace/` dir in the stack directory, and make `deploy/` hold the htpasswd as a FILE (rsync cannot overwrite a directory with a file) — then `workflow_dispatch` | | 5 | Docs: AGENTS.md Deployment table + live-edit §12 row 11 status | ✅ Done 2026-10-23 | | 6 | D10–D12 implementation: `site.ts` env read, `index.html` tokens + vite plugin, robots generation, `nginx.conf` variables, `vite.config.ts` env proxy, `deploy.yml` env, `.env.example`, AGENTS.md | ✅ Done 2026-10-23 — verified: `pnpm build` with `.env` filled emits injected meta + `dist/robots.txt`; `SITE_URL=` empty fails with the named-variable error; runtime files grep-clean of `vugado` | | 9 | D13 implementation: `compose.yaml` per §4.1 (secret `site_config` + entrypoint override), `.gitignore` += `secrets/`; VPS: create `secrets/site_config`, delete stack `.env` | 🟡 Repo side Done 2026-10-23 (`compose config --quiet` validates); owner-side file + stack `.env` removal TODO |