tahoe-lafs/web-landing-page
4
1
Fork 1
Code Issues 6 Pull requests 3 Actions Activity

Use the correct virtual hosts for prod

Browse source 
Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
This commit is contained in:
Benoit Donneaux 2025-05-09 09:41:11 +00:00
parent dcf1fbd4f6
commit 52382d65e3
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitea/workflows/jekyll.yaml
View file

@ -8,7 +8,8 @@ on:
env: env:
_UID: 1000 _UID: 1000
_GID: 1000 _GID: 1000
WEB_DOMAIN: 87b59b92.nip.io WEB_DOMAIN: tahoe-lafs.org
WEB_HOST: webforge.of.tahoe-lafs.org
WEB_USER: bot-www WEB_USER: bot-www
WEB_DIR: /var/www WEB_DIR: /var/www
jobs: jobs:
@ -18,7 +19,7 @@ jobs:
- name: Check out repository - name: Check out repository
id: checkout id: checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
github-server-url: 'https://forge.87b59b92.nip.io/' github-server-url: 'https://forge.of.tahoe-lafs.org/'
- name: Change file ownership - name: Change file ownership
id: file_ownership id: file_ownership
run: | run: |
@ -57,16 +58,17 @@ jobs:
id: deploy_site id: deploy_site
run: | run: |
if [ "${{ gitea.ref }}" = 'refs/heads/main' ]; then if [ "${{ gitea.ref }}" = 'refs/heads/main' ]; then
WEB_ROOT="${WEB_DIR}/site" WEB_ROOT="${WEB_DIR}/live"
WEB_HOST="www.${WEB_DOMAIN}" WEB_VHOST="home.of.${WEB_DOMAIN}"
WEB_CONTEXT='/' WEB_CONTEXT='/'
else else
WEB_ROOT="${WEB_DIR}/preview" WEB_ROOT="${WEB_DIR}/preview"
WEB_HOST="preview.${WEB_DOMAIN}" WEB_VHOST="preview.of.${WEB_DOMAIN}"
WEB_CONTEXT='/${{ gitea.event.pull_request.number }}/' WEB_CONTEXT='/${{ gitea.event.pull_request.number }}/'
fi fi
# Save those variabes in the environment for the next steps # Save those variabes in the environment for the next steps
echo "WEB_HOST=${WEB_HOST}" >> $GITHUB_ENV echo "WEB_HOST=${WEB_HOST}" >> $GITHUB_ENV
echo "WEB_VHOST=${WEB_VHOST}" >> $GITHUB_ENV
echo "WEB_CONTEXT=${WEB_CONTEXT}" >> $GITHUB_ENV echo "WEB_CONTEXT=${WEB_CONTEXT}" >> $GITHUB_ENV
# Prepare ssh key # Prepare ssh key
echo "${{ secrets.WWW_DEPLOY_KEY }}" > ~/.ssh/id_ed25519 echo "${{ secrets.WWW_DEPLOY_KEY }}" > ~/.ssh/id_ed25519
@ -74,7 +76,7 @@ jobs:
# Synchronize the local and the remote site # Synchronize the local and the remote site
rsync -halvi --delete \ rsync -halvi --delete \
-e "ssh -a -x -o StrictHostKeyChecking=no" \ -e "ssh -a -x -o StrictHostKeyChecking=no" \
./_site/ "${WEB_USER}@${WEB_DOMAIN}:${WEB_ROOT}${WEB_CONTEXT}" ./_site/ "${WEB_USER}@${WEB_HOST}:${WEB_ROOT}${WEB_CONTEXT}"
- name: Comment pull request - name: Comment pull request
id: comment_pull_request id: comment_pull_request
if: ${{ always() && gitea.event_name == 'pull_request' }} if: ${{ always() && gitea.event_name == 'pull_request' }}
@ -85,7 +87,7 @@ jobs:
"imageOutcome": "${{ steps.build_image.outcome }}", "imageOutcome": "${{ steps.build_image.outcome }}",
"buildOutcome": "${{ steps.build_site.outcome }}", "buildOutcome": "${{ steps.build_site.outcome }}",
"deployOutcome": "${{ steps.deploy_site.outcome }}", "deployOutcome": "${{ steps.deploy_site.outcome }}",
"deployWebHost": "${{ env.WEB_HOST }}", "deployWebHost": "${{ env.WEB_VHOST }}",
"deployWebContext": "${{ env.WEB_CONTEXT }}", "deployWebContext": "${{ env.WEB_CONTEXT }}",
"gitActor": "${{ gitea.actor }}", "gitActor": "${{ gitea.actor }}",
"gitEventName": "${{ gitea.event_name }}", "gitEventName": "${{ gitea.event_name }}",

4
.gitea/workflows/jekyll_cleanup.yml
View file

@ -6,7 +6,7 @@ on:
types: [ closed ] types: [ closed ]
env: env:
WEB_DOMAIN: lafs.eval.latfa.net WEB_HOST: webforge.of.tahoe-lafs.org
WEB_USER: www WEB_USER: www
WEB_ROOT: /var/www/preview WEB_ROOT: /var/www/preview
WEB_CONTEXT: "/${{ gitea.event.pull_request.number }}/" WEB_CONTEXT: "/${{ gitea.event.pull_request.number }}/"
@ -32,4 +32,4 @@ jobs:
chmod 600 ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519
# Delete preview context from the remote site # Delete preview context from the remote site
echo -e "set sftp:connect-program ssh -a -x -o StrictHostKeyChecking=no; rm -r -f ${WEB_ROOT}${WEB_CONTEXT}\nbye" \ echo -e "set sftp:connect-program ssh -a -x -o StrictHostKeyChecking=no; rm -r -f ${WEB_ROOT}${WEB_CONTEXT}\nbye" \
| lftp sftp://${WEB_USER}:unused@${WEB_DOMAIN} | lftp sftp://${WEB_USER}:unused@${WEB_HOST}