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. -- 2.47.2 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: | { -- 2.47.2 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: | -- 2.47.2 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: | -- 2.47.2 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: -- 2.47.2 From 4bb523a36de1399673d6654a01fa7bc6753965b6 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 --- .gitea/workflows/jekyll.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index 9b685f3..dbd02ea 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -57,11 +57,11 @@ jobs: run: | if [ "${{ gitea.ref }}" = 'refs/heads/main' ]; then WEB_ROOT="${WEB_DIR}/site" - WEB_HOST="www.${WEB_DOMAIN}" + WEB_HOST="live.www.${WEB_DOMAIN}" WEB_CONTEXT='/' else WEB_ROOT="${WEB_DIR}/preview" - WEB_HOST="preview.${WEB_DOMAIN}" + WEB_HOST="preview.www.${WEB_DOMAIN}" WEB_CONTEXT='/${{ gitea.event.pull_request.number }}/' fi # Save those variabes in the environment for the next steps -- 2.47.2