Website upgrade

.github/actions/spelling/allow.txt

@@ -33,6 +33,7 @@ fsp
 gpg
 gpgcheck
 gpgkey
+grotesk
 gssapi
 heroicons
 hmr
@@ -67,6 +68,7 @@ NTLM
 oftc
 oldstable
 OOXML
+osx
 OTP
 oxdc
 passdb
@@ -77,6 +79,7 @@ precompressed
 problue
 redhat
 releasever
+REMOTEPATH
 rhel
 RPA
 RPMS
@@ -110,5 +113,5 @@ workarounds
 wwwdev
 wwwkeys
 xchange
-xmpp
 XMPP
+xmpp

.github/actions/spelling/excludes.txt

@@ -11,6 +11,7 @@
 (?:^|/)vendor/
 (?:^|/|\b)requirements(?:-dev|-doc|-test|)\.txt$
 -lock\.yaml$
+/static/gpgkeys/[^/]+$
 \.a$
 \.ai$
 \.all-contributorsrc$
@@ -80,6 +81,6 @@
 \.xpm$
 \.xz$
 \.zip$
-ignore$
 ^\.github/
 ^\.vitepress/
+ignore$

.github/actions/spelling/expect.txt

@@ -0,0 +1,20 @@
+Admins
+Bento
+coreutils
+csaf
+DFBB
+Dists
+gpgkeys
+idx
+ircs
+listinfo
+noopener
+noreferrer
+onsubmit
+openemailsurvey
+prerender
+proactively
+sitemap
+SLAs
+splitscreen
+yeswehack

.github/actions/spelling/patterns.txt

@@ -78,3 +78,34 @@ public key [0-9A-F]{8,}\b
 # Ignore links to mailing list
 https://dovecot.org/mailman3/\S*
 https://dovecot.org/pipermail/\S*
+
+# Automatically suggested patterns
+
+# hit-count: 41 file-count: 1
+# in check-spelling@v0.0.22+, printf markers aren't automatically consumed
+# printf markers
+(?<!\\)\\[nrt](?=[a-z]{2,})
+
+# hit-count: 41 file-count: 1
+# alternate printf markers if you run into latex and friends
+(?<!\\)\\[nrt](?=[a-z]{2,})(?=.*['"`])
+
+# hit-count: 4 file-count: 4
+# githubusercontent
+/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+
+# hit-count: 4 file-count: 4
+# version suffix <word>v#
+(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
+
+# hit-count: 2 file-count: 2
+# Repeated letters
+\b([a-z])\g{-1}{2,}\b
+
+# hit-count: 1 file-count: 1
+# css url wrappings
+\burl\([^)]+\)
+
+# hit-count: 1 file-count: 1
+# regex choice
+\((?:\?:|)[^)|]+\|[^)|][^)]*\)

.github/dependabot.yml

@@ -1,6 +1,6 @@
 version: 2
 updates:
-  # Checks for dependency updates for documentation (VitePress)
+  # Checks for dependency updates for documentation
   - package-ecosystem: "npm"
     directory: "/"
     schedule:

.github/workflows/ci.yml

@@ -23,12 +23,9 @@ jobs:
         cache: npm
     - name: Install Dependencies
       run: npm ci --no-fund --no-audit
-    - name: Build main with VitePress
+    - name: Build main with Sveltekit
       run: |
-        npm run -w main docs:build
-    - name: Build repo with VitePress
+        npm run -w main build
+    - name: Build pigeonhole with Sveltekit
       run: |
-        npm run -w repo docs:build
-    - name: Build pigeonhole with VitePress
-      run: |
-        npm run -w pigeonhole docs:build
+        npm run -w pigeonhole build

.github/workflows/deploy.yml

@@ -7,8 +7,9 @@ on:
       - develop
 
 jobs:
-  releasenew:
+  dovecot:
     runs-on: ubuntu-latest
+    environment: dovecot
     steps:
     - name: Checkout
       uses: actions/checkout@v6
@@ -19,48 +20,78 @@ jobs:
         cache: npm
     - name: Install Dependencies
       run: npm ci --no-fund --no-audit
-    - name: Build dovecot.org with VitePress
+    - name: Build dovecot.org with Sveltekit
       run: |
-        npm run -w main docs:build
-    - name: Build repo.dovecot.org with VitePress
-      run: |
-        npm run -w repo docs:build
-    - name: Build pigeonhole with VitePress
-      run: |
-        npm run -w pigeonhole docs:build
-    - name: Deploy dovecot.org
+        npm run -w main build
+    - name: Deploy
       uses: dovecot/rsync-deployments@v2.0.3
       with:
         FLAGS: -azr --delete
-        HOST: dovecot.org
-        USER: website
-        LOCALPATH: /main/.vitepress/dist/.
-        REMOTEPATH: public_html/main/${{ github.ref_name }}
+        HOST: ${{ env.HOST }}
+        USER: ${{ env.DEPLOY_USER }}
+        LOCALPATH: /main/build/.
+        REMOTEPATH: ${{ env.REMOTEPATH }}/${{ github.ref_name }}
         DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-      if: env.DEPLOY_KEY
+      if: env.DEPLOY_KEY && env.HOST && env.DEPLOY_USER && env.REMOTEPATH
       env:
         DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-    - name: Deploy repo.dovecot.org
+        HOST: ${{ vars.HOST }}
+        # Not named USER: that would shadow the container's own USER.
+        DEPLOY_USER: ${{ vars.USER }}
+        REMOTEPATH: ${{ vars.REMOTEPATH }}
+
+  pigeonhole:
+    runs-on: ubuntu-latest
+    environment: pigeonhole
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+    - name: Setup Node
+      uses: actions/setup-node@v6
+      with:
+        node-version: 24
+        cache: npm
+    - name: Install Dependencies
+      run: npm ci --no-fund --no-audit
+    - name: Build pigeonhole with Sveltekit
+      run: |
+        npm run -w pigeonhole build
+    - name: Deploy
       uses: dovecot/rsync-deployments@v2.0.3
       with:
         FLAGS: -azr --delete
-        HOST: repo.dovecot.org
-        USER: website
-        LOCALPATH: /repo/.vitepress/dist/.
-        REMOTEPATH: public_html/${{ github.ref_name }}
+        HOST: ${{ env.HOST }}
+        USER: ${{ env.DEPLOY_USER }}
+        LOCALPATH: /pigeonhole/build/.
+        REMOTEPATH: ${{ env.REMOTEPATH }}/${{ github.ref_name }}
         DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-      if: env.DEPLOY_KEY
+      if: env.DEPLOY_KEY && env.HOST && env.DEPLOY_USER && env.REMOTEPATH
       env:
         DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-    - name: Deploy pigeonhole.dovecot.org
+        HOST: ${{ vars.HOST }}
+        # Not named USER: that would shadow the container's own USER.
+        DEPLOY_USER: ${{ vars.USER }}
+        REMOTEPATH: ${{ vars.REMOTEPATH }}
+
+  repo:
+    runs-on: ubuntu-latest
+    environment: repo
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+    - name: Deploy
       uses: dovecot/rsync-deployments@v2.0.3
       with:
         FLAGS: -azr --delete
-        HOST: pigeonhole.dovecot.org
-        USER: website
-        LOCALPATH: /pigeonhole/.vitepress/dist/.
-        REMOTEPATH: public_html/pigeonhole/${{ github.ref_name }}
+        HOST: ${{ env.HOST }}
+        USER: ${{ env.DEPLOY_USER }}
+        LOCALPATH: /repo/.
+        REMOTEPATH: ${{ env.REMOTEPATH }}/${{ github.ref_name }}
         DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-      if: env.DEPLOY_KEY
+      if: env.DEPLOY_KEY && env.HOST && env.DEPLOY_USER && env.REMOTEPATH
       env:
         DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
+        HOST: ${{ vars.HOST }}
+        # Not named USER: that would shadow the container's own USER.
+        DEPLOY_USER: ${{ vars.USER }}
+        REMOTEPATH: ${{ vars.REMOTEPATH }}

README.md

@@ -1,25 +1,58 @@
-Dovecot websites
-================
+# Dovecot Websites
 
 This repository is for maintaining Dovecot's public websites.
 
 Map of websites
 
- - main => dovecot.org website
- - repo => repo.dovecot.org
- - pigeonhole => pigeonhole.dovecot.org
+- main => dovecot.org website
+- pigeonhole => pigeonhole.dovecot.org
+- repo => repository index redirect page (host/path set in the `repo` environment)
 
-Building a website
-------------------
+## Building a Website
 
-You can use npm run -w <website> run docs:build
+`npm run -w <website> build`
 
-Adding new one
---------------
+## Adding New Website
 
-Use `npm init -w ./name` to add new website. This should get added into package.json too
+Use `npm init -w ./name` to add new website. This should get added into package.json too.
+
+## Testing
+
+Push changes first to `develop` branch to make sure they work, this will deploy as <https://wwwdev.dovecot.org>.
 
-Testing
--------
-Push changes first to `develop` branch to make sure they work, this will deploy as https://wwwdev.dovecot.org.
 Once you've checked your changes, create pull request to main branch.
+
+Local testing can be accomplished via `npm run -w <website> dev`.
+
+## Deployment
+
+Deployment is driven by GitHub Actions environments, one per site:
+
+| Environment  | Source                 |
+|--------------|------------------------|
+| `dovecot`    | `main/build`           |
+| `pigeonhole` | `pigeonhole/build`     |
+| `repo`       | `repo/` (copied as-is) |
+
+Every environment deploys from both `main` and `develop`.
+
+Each environment supplies `HOST`, `USER` and `REMOTEPATH` as environment
+variables and `DEPLOY_KEY` as an environment secret. `REMOTEPATH` is the base directory; the
+branch name is appended to it, so each site keeps its `main` and `develop`
+copies side by side under `/home/website/public_html/<component>/<branch>`;
+<https://wwwdev.dovecot.org> is served from the `dovecot` environment's
+`develop` one.
+
+A missing `DEPLOY_KEY`, `HOST`, `USER` or `REMOTEPATH` makes that environment's
+deploy step skip silently.
+
+### Subdirectory Deployments (`BASE_PATH`)
+
+If hosting a website under a custom subdirectory (for instance `/test/main`),
+supply the `BASE_PATH` environment variable when building:
+
+```bash
+BASE_PATH=/test/main npm run -w main build
+```
+
+This updates SvelteKit's `paths.base` configuration so all routes and static assets resolve correctly.

main/.gitignore

@@ -0,0 +1,20 @@
+node_modules
+
+# Output
+.output
+/.svelte-kit
+/build
+
+# Env
+.env
+.env.*
+!.env.example
+!.env.test
+
+# Vite
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*
+
+# Auto-generated data files
+src/lib/data/news.json
+src/lib/data/security.json

main/.npmrc

@@ -0,0 +1 @@
+engine-strict=true