From b2cb9344e576eb2b4ba4441128d323620797ed38 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 2 Nov 2025 01:09:10 +0100 Subject: [PATCH 1/3] workflow for prod --- .github/workflows/build-and-deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 9339db7..272ae33 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -3,7 +3,7 @@ name: Build Astro and deploy dist on: push: branches: - - stage # or your default branch + - prod # or your default branch workflow_dispatch: permissions: @@ -12,7 +12,7 @@ permissions: jobs: build: runs-on: ubuntu-latest - environment: stage + environment: prod steps: - name: Checkout code @@ -29,7 +29,7 @@ jobs: - name: Build Astro project run: npm run build - - name: Deploy dist to dist-stage + - name: Deploy dist to dist-prod run: | # Configure Git git config user.name "github-actions[bot]" @@ -46,7 +46,7 @@ jobs: git branch git commit -m "Update dist/ [skip ci]" - git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/Signum/workaround-astro-starlight.git temp-build:dist-stage --force + git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/Signum/ispmail-workaround-org.git temp-build:dist-prod --force - name: Trigger deployment webhook run: | From 55e4a5e52ae615d92c235444bec5e2ab401f292f Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 2 Nov 2025 21:20:55 +0100 Subject: [PATCH 2/3] rewording --- src/components/Banner.astro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Banner.astro b/src/components/Banner.astro index 21f2314..e065214 100644 --- a/src/components/Banner.astro +++ b/src/components/Banner.astro @@ -26,7 +26,8 @@ const isBookworm = Astro.url.pathname.startsWith("/ispmail-bookworm/"); { isBookworm && (
- ⚠️ This section is outdated. Please use the guide for Debian Trixie. + ⚠️ This page is part of the ISPmail guide for Debian Bookworm. Please use the newer guide for{" "} + Debian Trixie.
) } From 242f20c0ac0776f5f4dbdaab086806190ed2f5e7 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 2 Nov 2025 21:21:06 +0100 Subject: [PATCH 3/3] typos --- src/content/docs/ispmail-trixie/110-upgrading.mdx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/content/docs/ispmail-trixie/110-upgrading.mdx b/src/content/docs/ispmail-trixie/110-upgrading.mdx index 037f782..ac4d7d1 100644 --- a/src/content/docs/ispmail-trixie/110-upgrading.mdx +++ b/src/content/docs/ispmail-trixie/110-upgrading.mdx @@ -65,7 +65,7 @@ You need to copy the database that contains the control data about your email do (Bookworm) server as root and back up the *mailserver* database. That is as easy as running… ``` -mysqldump mailserver > mailserver.sql +mariadb-dump mailserver > mailserver.sql ``` Copy that file to the new server (using *scp*) and import it there: @@ -83,7 +83,7 @@ If your users are using Roundcube as a webmail interface then you should migrate Dump the SQL from the old server: ``` -mysqldump roundcube > roundcube.sql +mariadb-dump roundcube > roundcube.sql ``` Copy that file to the new server and import it: @@ -109,7 +109,7 @@ Details are found in the rspamd chapter. (**Hot** means: copy the files why they are still in use and potentially change while you do that.) Fortunately Dovecot uses the maildir format that stores emails as plain files on disk. Login to the new (Trixie) server and use *rsync* to -copy over the mails from the old (Bullseye) mail server: +copy over the mails from the old (Bookworm) mail server: ``` rsync -va oldserver:/var/vmail/ /var/vmail/ @@ -117,7 +117,7 @@ rsync -va oldserver:/var/vmail/ /var/vmail/ (Note the trailing slashes. Type them exactly as shown above or your files will end up in wrong places.) -There is no need to shut down Dovecot on your production Bullseye server. Copying the files while Dovecot is running +There is no need to shut down Dovecot on your production Bookworm server. Copying the files while Dovecot is running will not break anything. This is called a “hot copy". It may not be consistent but it will save time during the final synchronization.