mirror of
https://github.com/dong-nz/cv.git
synced 2026-11-22 16:10:40 +07:00
infra: Basic-auth file leaves the repository (spec-v6 D16) — deploy/htpasswd gitignored, written on the VPS from the HTPASSWD_CONTENT secret; Gitea mirrors brought to full parity (permissions, STACK_DIR/CONTAINER_NAME guards)
This commit is contained in:
1 parent
c535e7a295
commit
a5ff55bacf
11 files changed
+199
-63
No files matched your search
@@ -1,8 +1,11 @@
|
||||
name: Redeploy Nginx
|
||||
|
||||
# Infra files only (spec-v4-deploy-infra D1): a change to the nginx template,
|
||||
# the compose definition, or the Basic-auth file redeploys the container —
|
||||
# content commits never do. workflow_dispatch is the token-rotation runbook.
|
||||
# Infra files only (spec-v4-deploy-infra D1): a change to the nginx template or
|
||||
# the compose definition redeploys the container — content commits never do.
|
||||
# workflow_dispatch is the token-rotation runbook. The Basic-auth file is no
|
||||
# longer repository content (spec-v6 D16): the HTPASSWD_CONTENT secret carries
|
||||
# it and the job writes it on the server. Mirror of .github/workflows/ —
|
||||
# scheduled for deletion (D9); kept behaviour-identical until then.
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
@@ -10,7 +13,6 @@ on:
|
||||
paths:
|
||||
- nginx.conf
|
||||
- compose.yaml
|
||||
- deploy/htpasswd
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
@@ -20,21 +22,60 @@ concurrency:
|
||||
jobs:
|
||||
redeploy:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
# The stack directory and the container name are the server's deployment layout,
|
||||
# not repository content: both come from repository variables (spec-v6 D15), and
|
||||
# STACK_DIR is the same value `deploy.yml` uses. A missing STACK_DIR would rsync
|
||||
# the two infra files into the remote user's home and then run docker in the
|
||||
# wrong place; a CONTAINER_NAME that disagrees with the service this repository
|
||||
# ships would recreate nothing and probe a container that does not exist. Both are
|
||||
# refused here — before any rsync, before anything reaches the server.
|
||||
- name: Check stack variables
|
||||
env:
|
||||
STACK_DIR: ${{ vars.STACK_DIR }}
|
||||
CONTAINER_NAME: ${{ vars.CONTAINER_NAME }}
|
||||
run: |
|
||||
case "$STACK_DIR" in
|
||||
/*) ;;
|
||||
*)
|
||||
echo "::error::STACK_DIR is not an absolute path — add it as a repository variable (Settings → Actions → Secrets and Variables → Variables), value: the Dockge stack directory, e.g. /opt/stacks/dong-site"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
case "$STACK_DIR" in
|
||||
*/)
|
||||
echo "::error::STACK_DIR must not end with / — this job appends the slashes it needs"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
# The name is used twice over: as the compose service to recreate, and as the
|
||||
# docker target of the health probe. compose.yaml — this repository — declares
|
||||
# both, so the variable is checked against the file it has to agree with.
|
||||
if ! grep -qE "^ ${CONTAINER_NAME}:" compose.yaml; then
|
||||
echo "::error::CONTAINER_NAME is not a service in compose.yaml — the recreate step names a compose service, so the two must match"
|
||||
exit 1
|
||||
fi
|
||||
if ! grep -qF "container_name: ${CONTAINER_NAME}" compose.yaml; then
|
||||
echo "::error::CONTAINER_NAME does not match container_name in compose.yaml — docker exec and docker logs target that name"
|
||||
exit 1
|
||||
fi
|
||||
echo "Stack: $STACK_DIR, container: $CONTAINER_NAME"
|
||||
|
||||
# Ship exactly the three triggered files. Never .env, never secrets/ (D6).
|
||||
# Ship exactly the two 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.
|
||||
# file's basename in remote_path.
|
||||
- name: Sync nginx.conf
|
||||
uses: burnett01/rsync-deployments@v9
|
||||
with:
|
||||
switches: -avz
|
||||
path: nginx.conf
|
||||
remote_path: /opt/stacks/dong-site/
|
||||
remote_path: ${{ vars.STACK_DIR }}/
|
||||
remote_host: ${{ secrets.DEPLOY_HOST }}
|
||||
remote_port: ${{ secrets.DEPLOY_SSH_PORT }}
|
||||
remote_user: ${{ secrets.DEPLOY_USER }}
|
||||
@@ -44,26 +85,44 @@ jobs:
|
||||
with:
|
||||
switches: -avz
|
||||
path: compose.yaml
|
||||
remote_path: /opt/stacks/dong-site/
|
||||
remote_host: ${{ secrets.DEPLOY_HOST }}
|
||||
remote_port: ${{ secrets.DEPLOY_SSH_PORT }}
|
||||
remote_user: ${{ secrets.DEPLOY_USER }}
|
||||
remote_key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
|
||||
- name: Sync deploy/htpasswd
|
||||
uses: burnett01/rsync-deployments@v9
|
||||
with:
|
||||
switches: -avz
|
||||
path: deploy/htpasswd
|
||||
remote_path: /opt/stacks/dong-site/deploy/
|
||||
remote_path: ${{ vars.STACK_DIR }}/
|
||||
remote_host: ${{ secrets.DEPLOY_HOST }}
|
||||
remote_port: ${{ secrets.DEPLOY_SSH_PORT }}
|
||||
remote_user: ${{ secrets.DEPLOY_USER }}
|
||||
remote_key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
|
||||
|
||||
# The Basic-auth file is repository-secret content, not repository content
|
||||
# (spec-v6 D16): the HTPASSWD_CONTENT secret carries the one htpasswd line
|
||||
# (user + bcrypt hash), inlined into a single-quoted shell literal — a
|
||||
# bcrypt hash is riddled with `$` and appleboy's `envs:` mechanism exports
|
||||
# values unquoted, so the remote shell would expand `$2y…` away. Written
|
||||
# BEFORE the test step: nginx -t opens auth_basic_user_file, so its mount
|
||||
# needs a real file. chmod 600 keeps the credential readable only by the
|
||||
# stack owner. Needs the HTPASSWD_CONTENT secret on Gitea too.
|
||||
- name: Write deploy/htpasswd from the secret
|
||||
uses: appleboy/ssh-action@v1.2.0
|
||||
with:
|
||||
host: ${{ secrets.DEPLOY_HOST }}
|
||||
port: ${{ secrets.DEPLOY_SSH_PORT }}
|
||||
username: ${{ secrets.DEPLOY_USER }}
|
||||
key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
|
||||
script: |
|
||||
cd "${{ vars.STACK_DIR }}"
|
||||
HTPASSWD='${{ secrets.HTPASSWD_CONTENT }}'
|
||||
if [ -z "$HTPASSWD" ]; then
|
||||
echo "HTPASSWD_CONTENT is not set as a repository secret — add the output of: htpasswd -nbB <user> '<pass>'" >&2
|
||||
exit 1
|
||||
fi
|
||||
mkdir -p deploy
|
||||
printf '%s\n' "$HTPASSWD" > deploy/htpasswd
|
||||
chmod 600 deploy/htpasswd
|
||||
|
||||
# Test-before-touch (D3): the throwaway container runs the same entrypoint
|
||||
# render pipeline as production, with placeholder values — nginx -t checks
|
||||
# syntax only, so the real token never enters this container or the job.
|
||||
# A failure here fails the job; the live container keeps serving.
|
||||
# The placeholder must be a resolvable literal IP: a literal hostname in
|
||||
# proxy_pass IS resolved while the config is parsed (spec-v4-deploy-infra §4).
|
||||
- name: Test new config
|
||||
uses: appleboy/ssh-action@v1.2.0
|
||||
with:
|
||||
@@ -72,7 +131,7 @@ jobs:
|
||||
username: ${{ secrets.DEPLOY_USER }}
|
||||
key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
|
||||
script: |
|
||||
cd /opt/stacks/dong-site
|
||||
cd "${{ vars.STACK_DIR }}"
|
||||
docker run --rm \
|
||||
-v "$PWD/nginx.conf:/etc/nginx/templates/default.conf.template:ro" \
|
||||
-v "$PWD/deploy/htpasswd:/etc/nginx/htpasswd:ro" \
|
||||
@@ -82,7 +141,8 @@ jobs:
|
||||
nginx:alpine nginx -t
|
||||
|
||||
# Apply + verify (D4): recreate is the same command the Dockge deploy
|
||||
# button runs. The health probe uses wget because nginx:alpine carries no
|
||||
# button runs, with the service/container names from CONTAINER_NAME — already
|
||||
# checked against compose.yaml above. The health probe uses wget because nginx:alpine carries no
|
||||
# curl; on failure the job prints the container log and fails.
|
||||
- name: Recreate and probe
|
||||
uses: appleboy/ssh-action@v1.2.0
|
||||
@@ -92,11 +152,11 @@ jobs:
|
||||
username: ${{ secrets.DEPLOY_USER }}
|
||||
key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
|
||||
script: |
|
||||
cd /opt/stacks/dong-site
|
||||
docker compose up -d --force-recreate dong-site
|
||||
cd "${{ vars.STACK_DIR }}"
|
||||
docker compose up -d --force-recreate "${{ vars.CONTAINER_NAME }}"
|
||||
sleep 2
|
||||
if ! docker exec dong-site wget -q -O /dev/null http://127.0.0.1/; then
|
||||
docker logs --tail 50 dong-site
|
||||
if ! docker exec "${{ vars.CONTAINER_NAME }}" wget -q -O /dev/null http://127.0.0.1/; then
|
||||
docker logs --tail 50 "${{ vars.CONTAINER_NAME }}"
|
||||
exit 1
|
||||
fi
|
||||
docker exec dong-site nginx -t
|
||||
docker exec "${{ vars.CONTAINER_NAME }}" nginx -t
|
||||
@@ -12,9 +12,12 @@ concurrency:
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
# Site identity (spec-v4-deploy-infra D10/D12): the build and the resume
|
||||
permissions:
|
||||
contents: read
|
||||
# Site identity (spec-v4-deploy-infra D10/D12, spec-v6 D3): the build and the resume
|
||||
# generator derive every published URL and the page title from these two
|
||||
# values; the build fails loudly when either is missing.
|
||||
# values; the build fails loudly when either is missing. They are repository
|
||||
# variables — public values, not secrets.
|
||||
env:
|
||||
SITE_URL: ${{ vars.SITE_URL }}
|
||||
SITE_NAME: ${{ vars.SITE_NAME }}
|
||||
@@ -36,6 +39,8 @@ jobs:
|
||||
generate-resume:
|
||||
runs-on: ubuntu-latest
|
||||
needs: build
|
||||
permissions:
|
||||
contents: read
|
||||
env:
|
||||
SITE_URL: ${{ vars.SITE_URL }}
|
||||
SITE_NAME: ${{ vars.SITE_NAME }}
|
||||
@@ -82,7 +87,32 @@ jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [build, generate-resume]
|
||||
permissions:
|
||||
contents: read
|
||||
steps:
|
||||
# The stack directory is the server's deployment layout, not repository
|
||||
# content: it comes from the STACK_DIR repository variable (spec-v6 D15). An
|
||||
# empty or malformed value would aim rsync at /dist/ on the remote host, so the
|
||||
# job refuses it here — before any artifact download, before anything reaches the
|
||||
# server — exactly like the site-identity check refuses a missing SITE_URL.
|
||||
- name: Check stack directory
|
||||
env:
|
||||
STACK_DIR: ${{ vars.STACK_DIR }}
|
||||
run: |
|
||||
case "$STACK_DIR" in
|
||||
/*) ;;
|
||||
*)
|
||||
echo "::error::STACK_DIR is not an absolute path — add it as a repository variable (Settings → Actions → Secrets and Variables → Variables), value: the Dockge stack directory, e.g. /opt/stacks/dong-site"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
case "$STACK_DIR" in
|
||||
*/)
|
||||
echo "::error::STACK_DIR must not end with / — this job appends /dist/ itself"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
echo "Deploy target: $STACK_DIR/dist/"
|
||||
- uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: static-site
|
||||
@@ -104,7 +134,7 @@ jobs:
|
||||
debug: true
|
||||
switches: -avzr --delete
|
||||
path: dist/
|
||||
remote_path: /opt/stacks/dong-site/dist/
|
||||
remote_path: ${{ vars.STACK_DIR }}/dist/
|
||||
remote_host: ${{ secrets.DEPLOY_HOST }}
|
||||
remote_port: ${{ secrets.DEPLOY_SSH_PORT }}
|
||||
remote_user: ${{ secrets.DEPLOY_USER }}
|
||||
|
||||
Reference in new issue
Block a user