From 5411e2d461b9d80c4bd7703490b1d9f8481433e0 Mon Sep 17 00:00:00 2001 From: btlogy Date: Thu, 8 May 2025 22:38:06 +0000 Subject: [PATCH 1/6] Remove the about us picture --- src/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/index.html b/src/index.html index 0974f32..16faef1 100644 --- a/src/index.html +++ b/src/index.html @@ -70,8 +70,6 @@ blog: excerpt: "" about: - title: "About us" - image_path: /assets/images/aboutus.png - alt: "aboutus" excerpt: >- Tahoe-LAFS is an open-source project supported by donations and maintained by a group of hardy volunteers. From c3c425a2722454bbca15b73d8f343c3159c848f8 Mon Sep 17 00:00:00 2001 From: btlogy Date: Fri, 9 May 2025 07:03:01 +0000 Subject: [PATCH 2/6] Update .gitea/workflows/jekyll.yaml Explicitly use the pr-commenter-action from GH --- .gitea/workflows/jekyll.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index dc24ffa..b70b445 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -77,7 +77,7 @@ jobs: - name: Comment pull request id: comment_pull_request if: ${{ always() && gitea.event_name == 'pull_request' }} - uses: exercism/pr-commenter-action@v1.5.1 + uses: https://github.com/exercism/pr-commenter-action@v1.5.1 with: template-variables: | { From 705bfae6000954675b07471578db2401bb2376a0 Mon Sep 17 00:00:00 2001 From: btlogy Date: Fri, 9 May 2025 07:10:59 +0000 Subject: [PATCH 3/6] Update .gitea/workflows/jekyll.yaml --- .gitea/workflows/jekyll.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index b70b445..c56788e 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -18,6 +18,7 @@ jobs: - name: Check out repository id: checkout uses: actions/checkout@v4 + github-server-url: 'https://forge.87b59b92.nip.io/' - name: Change file ownership id: file_ownership run: | From 75e211670a1ac037ca75e4eb06f1b5851ef52e00 Mon Sep 17 00:00:00 2001 From: btlogy Date: Fri, 9 May 2025 09:21:04 +0000 Subject: [PATCH 4/6] Point to the prod server instead of eval --- .gitea/workflows/jekyll.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index c56788e..543e72f 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -8,7 +8,7 @@ on: env: _UID: 1000 _GID: 1000 - WEB_DOMAIN: lafs.eval.latfa.net + WEB_DOMAIN: 87b59b92.nip.io WEB_USER: www WEB_DIR: /var/www jobs: @@ -18,7 +18,6 @@ jobs: - name: Check out repository id: checkout uses: actions/checkout@v4 - github-server-url: 'https://forge.87b59b92.nip.io/' - name: Change file ownership id: file_ownership run: | From dc72206742192cc442b78a753bd8bb8f8217b082 Mon Sep 17 00:00:00 2001 From: btlogy Date: Fri, 9 May 2025 09:23:34 +0000 Subject: [PATCH 5/6] Use the correct username to deploy on prod --- .gitea/workflows/jekyll.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index 543e72f..9b685f3 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -9,7 +9,7 @@ env: _UID: 1000 _GID: 1000 WEB_DOMAIN: 87b59b92.nip.io - WEB_USER: www + WEB_USER: bot-www WEB_DIR: /var/www jobs: jekyll: From 6ba39ee1dd80a2500197d6a12657a2ff8757dfba Mon Sep 17 00:00:00 2001 From: btlogy Date: Fri, 9 May 2025 09:41:11 +0000 Subject: [PATCH 6/6] Use the correct virtual hosts for production Signed-off-by: Benoit Donneaux --- .gitea/workflows/jekyll.yaml | 16 +++++++++------- .gitea/workflows/jekyll_cleanup.yml | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index 9b685f3..5a643d9 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -8,7 +8,8 @@ on: env: _UID: 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_DIR: /var/www jobs: @@ -44,7 +45,7 @@ jobs: - name: Build Jekyll site id: build_site run: | - # Overwrite the baseurl for previewonly + # Overwrite the baseurl for preview only if [ "${{ gitea.event_name }}" = 'pull_request' ]; then echo "Overwriting baseurl for pull_request ${{ gitea.event.pull_request.number }}" sed -i -r -e 's/^baseurl:\s*"([^"]*)"/baseurl: "\1\/${{ gitea.event.pull_request.number }}"/' _config.yml @@ -56,16 +57,17 @@ jobs: id: deploy_site run: | if [ "${{ gitea.ref }}" = 'refs/heads/main' ]; then - WEB_ROOT="${WEB_DIR}/site" - WEB_HOST="www.${WEB_DOMAIN}" + WEB_ROOT="${WEB_DIR}/live" + WEB_VHOST="home.of.${WEB_DOMAIN}" WEB_CONTEXT='/' else WEB_ROOT="${WEB_DIR}/preview" - WEB_HOST="preview.${WEB_DOMAIN}" + WEB_VHOST="preview.of.${WEB_DOMAIN}" WEB_CONTEXT='/${{ gitea.event.pull_request.number }}/' fi # Save those variabes in the environment for the next steps echo "WEB_HOST=${WEB_HOST}" >> $GITHUB_ENV + echo "WEB_VHOST=${WEB_VHOST}" >> $GITHUB_ENV echo "WEB_CONTEXT=${WEB_CONTEXT}" >> $GITHUB_ENV # Prepare ssh key echo "${{ secrets.WWW_DEPLOY_KEY }}" > ~/.ssh/id_ed25519 @@ -73,7 +75,7 @@ jobs: # Synchronize the local and the remote site rsync -halvi --delete \ -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 id: comment_pull_request if: ${{ always() && gitea.event_name == 'pull_request' }} @@ -84,7 +86,7 @@ jobs: "imageOutcome": "${{ steps.build_image.outcome }}", "buildOutcome": "${{ steps.build_site.outcome }}", "deployOutcome": "${{ steps.deploy_site.outcome }}", - "deployWebHost": "${{ env.WEB_HOST }}", + "deployWebHost": "${{ env.WEB_VHOST }}", "deployWebContext": "${{ env.WEB_CONTEXT }}", "gitActor": "${{ gitea.actor }}", "gitEventName": "${{ gitea.event_name }}", diff --git a/.gitea/workflows/jekyll_cleanup.yml b/.gitea/workflows/jekyll_cleanup.yml index b69ad1f..ebbded7 100644 --- a/.gitea/workflows/jekyll_cleanup.yml +++ b/.gitea/workflows/jekyll_cleanup.yml @@ -6,7 +6,7 @@ on: types: [ closed ] env: - WEB_DOMAIN: lafs.eval.latfa.net + WEB_HOST: webforge.of.tahoe-lafs.org WEB_USER: www WEB_ROOT: /var/www/preview WEB_CONTEXT: "/${{ gitea.event.pull_request.number }}/" @@ -32,4 +32,4 @@ jobs: chmod 600 ~/.ssh/id_ed25519 # 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" \ - | lftp sftp://${WEB_USER}:unused@${WEB_DOMAIN} + | lftp sftp://${WEB_USER}:unused@${WEB_HOST}