diff --git a/.gitea/pr-commenter.yml b/.forgejo/pr-commenter.yml similarity index 100% rename from .gitea/pr-commenter.yml rename to .forgejo/pr-commenter.yml diff --git a/.gitea/workflows/jekyll.yaml b/.forgejo/workflows/jekyll.yaml similarity index 76% rename from .gitea/workflows/jekyll.yaml rename to .forgejo/workflows/jekyll.yaml index dc24ffa..68eb783 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.forgejo/workflows/jekyll.yaml @@ -8,8 +8,9 @@ on: env: _UID: 1000 _GID: 1000 - WEB_DOMAIN: lafs.eval.latfa.net - WEB_USER: www + WEB_DOMAIN: tahoe-lafs.org + WEB_HOST: webforge.of.tahoe-lafs.org + WEB_USER: bot-www WEB_DIR: /var/www jobs: jekyll: @@ -18,6 +19,7 @@ jobs: - name: Check out repository id: checkout uses: actions/checkout@v4 + github-server-url: 'https://forge.of.tahoe-lafs.org/' - name: Change file ownership id: file_ownership run: | @@ -44,7 +46,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 +58,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,23 +76,23 @@ 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' }} - uses: exercism/pr-commenter-action@v1.5.1 + uses: https://github.com/exercism/pr-commenter-action@v1.5.1 with: template-variables: | { "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 }}", - "gitWorkflow": "${{ gitea.workflow }}", - "gitRunNumber": "${{ gitea.run_number }}", - "gitRunAttempt": "${{ gitea.run_attempt }}" + "gitActor": "${{ forgejo.actor }}", + "gitEventName": "${{ forgejo.event_name }}", + "gitWorkflow": "${{ forgejo.workflow }}", + "gitRunNumber": "${{ forgejo.run_number }}", + "gitRunAttempt": "${{ forgejo.run_attempt }}" } config-file: ".gitea/pr-commenter.yml" diff --git a/.gitea/workflows/jekyll_cleanup.yml b/.forgejo/workflows/jekyll_cleanup.yml similarity index 85% rename from .gitea/workflows/jekyll_cleanup.yml rename to .forgejo/workflows/jekyll_cleanup.yml index b69ad1f..a527993 100644 --- a/.gitea/workflows/jekyll_cleanup.yml +++ b/.forgejo/workflows/jekyll_cleanup.yml @@ -6,10 +6,10 @@ 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 }}/" + WEB_CONTEXT: "/${{ forgejo.event.pull_request.number }}/" jobs: jekyll_cleanup: runs-on: ubuntu-22.04 @@ -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}