From 25a3de0f1fd7d7775a7d7725f92c34304fdcde95 Mon Sep 17 00:00:00 2001 From: Sluijsens Date: Tue, 28 Jul 2026 20:08:44 +0200 Subject: [PATCH] Stops mixing gitea-workflow with the generic deploy-user placeholder Same account, one name throughout instead of switching partway in. --- .../features/gitea-deployment-workflow/audit.md | 11 +++++++++++ .../deployment/deployment-instructions.md | 17 +++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/aidlc-docs/features/gitea-deployment-workflow/audit.md b/aidlc-docs/features/gitea-deployment-workflow/audit.md index ea40161..2d6c712 100644 --- a/aidlc-docs/features/gitea-deployment-workflow/audit.md +++ b/aidlc-docs/features/gitea-deployment-workflow/audit.md @@ -1301,3 +1301,14 @@ by Infrastructure Design. U5 carries REF-U3-01's Umami origin gate plus FR-21 an **Context**: OPERATIONS — Deployment Setup, naming correction before final approval --- +## Deployment Setup — Placeholder Consistency Fix + +**Timestamp**: 2026-07-28T04:10:00Z + +**User Input**: "Nee het is goed, maar de handleiding stapt ineens over naar in plaats van gitea-workflow" + +**AI Response**: "Replaced all remaining placeholders with the concrete gitea-workflow name throughout deployment-instructions.md, so the document reads consistently instead of switching between the concrete name and a generic placeholder." + +**Context**: OPERATIONS — Deployment Setup, consistency fix before final approval + +--- diff --git a/aidlc-docs/features/gitea-deployment-workflow/operations/deployment/deployment-instructions.md b/aidlc-docs/features/gitea-deployment-workflow/operations/deployment/deployment-instructions.md index 0a8d0e8..db7b2d8 100644 --- a/aidlc-docs/features/gitea-deployment-workflow/operations/deployment/deployment-instructions.md +++ b/aidlc-docs/features/gitea-deployment-workflow/operations/deployment/deployment-instructions.md @@ -45,11 +45,12 @@ it if currently blocked at the `sshd_config` level). This merges the FTP and dep account — acceptable as a fallback, but worth revisiting later, since it means a website-workspace author's FTP credential would also be able to run shell commands on the Pi. -The rest of this document uses `` — substitute the generic account's actual name. +The rest of this document uses `gitea-workflow` as the example account name — rename consistently +if you pick something else. ### 1.3 Enable Lingering (INFRA-U6-01 — do this first, easy to forget) ```bash -sudo loginctl enable-linger +sudo loginctl enable-linger gitea-workflow ``` Without this, the `systemd --user` service manager is torn down when the deploy SSH session ends, killing the just-restarted app a few seconds after every successful deploy. This also fixes the @@ -59,7 +60,7 @@ running independent of any login session. ### 1.4 Directory Skeleton -Deliberately placed under ``'s **own home directory**, not under +Deliberately placed under `gitea-workflow`'s **own home directory**, not under `/mnt/storage1/www/html/` — since it's now a separate account from `webadmin`, there is no reason for the CMS's own release/current/shared structure to live anywhere near the other websites at all, which directly avoids interfering with them (as you asked in Q2): @@ -82,7 +83,7 @@ ln -s /mnt/storage1/www/html/slpmodularcms- ~/apps/slpmodularcms-/shar `deploy-scp.yaml`'s existing logic (`releases/{ts}/wwwroot/web -> ../../../shared/wwwroot-web`) needs no changes for this — it only ever resolves the symlink chain, it doesn't care how many hops -that chain has. What **does** need attention: `` needs read + traverse permission on +that chain has. What **does** need attention: `gitea-workflow` needs read + traverse permission on `/mnt/storage1/www/html/slpmodularcms-/` and its parent directories, which `webadmin` owns. Simplest fix: put both accounts in a shared group (e.g. `webshared`), `chgrp -R webshared` that folder, and make sure webadmin's FTP server creates new uploads group-readable (`g+rx`, not just @@ -199,10 +200,10 @@ change: |---|---|---| | `PI_MAIN_ADDRESS` | secret | the Pi's address | | `PI_MAIN_PORT` | secret | SSH port | -| `PI_MAIN_USERNAME` | secret | `` — the generic, host-wide deploy account (§ 1.2), **not** `webadmin`; reuse the reference project's if it already has one | -| `PI_MAIN_PASSWORD` | secret | ``'s password | -| `DEPLOY_PATH_TEST` | variable | `/home//apps/slpmodularcms-test` | -| `DEPLOY_PATH_PRODUCTION` | variable | `/home//apps/slpmodularcms-production` | +| `PI_MAIN_USERNAME` | secret | `gitea-workflow` — the generic, host-wide deploy account (§ 1.2), **not** `webadmin`; reuse the reference project's if it already has one | +| `PI_MAIN_PASSWORD` | secret | `gitea-workflow`'s password | +| `DEPLOY_PATH_TEST` | variable | `/home/gitea-workflow/apps/slpmodularcms-test` | +| `DEPLOY_PATH_PRODUCTION` | variable | `/home/gitea-workflow/apps/slpmodularcms-production` | | `SERVICE_NAME_TEST` | variable | `slpmodularcms-test.service` | | `SERVICE_NAME_PRODUCTION` | variable | `slpmodularcms-production.service` | | `HEALTH_CHECK_URL_TEST` | variable | `https://test.slpsoftware.nl/health` |