Merge branch 'main' into dict-pattern

Author: sirainen

.github/workflows/2_3.yml

@@ -0,0 +1,27 @@
+name: Deploy 2.3
+
+on:
+  push:
+    branches:
+      - release-2.3
+    tags:
+      - '2.3.*'
+
+jobs:
+  release_2_3:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/release-2.3'
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dovecot/[email protected]
+    - uses: dovecot/[email protected]
+      with:
+        FLAGS: -azr --delete
+        HOST: doc.dovecot.org
+        USER: docs
+        LOCALPATH: /build/.
+        REMOTEPATH: public_html/2.3
+        DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
+      if: env.DEPLOY_KEY
+      env:
+        DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}

.github/workflows/main.yml

@@ -1,15 +1,14 @@
-name: Deploy main
+name: Deploy 2.4
 
 on:
   push:
     branches:
       - main
-      - release-2.3
     tags:
-      - '2.*'
+      - '2.4.*'
 
 jobs:
-  releasenew:
+  release_2_4:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
@@ -70,9 +69,9 @@ jobs:
       with:
         name: documentation-tar
         path: tars/docs.tgz
-  publishnew:
+  publish_2_4:
     runs-on: ubuntu-latest
-    needs: releasenew
+    needs: release_2_4
     if: github.ref == 'refs/heads/main'
     name: Publish documentation tarball
     steps:
@@ -99,20 +98,3 @@ jobs:
         files: |
           ./SHA256SUMS.txt
           ./docs.tgz
-  release23:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/release-2.3'
-    steps:
-    - uses: actions/checkout@v4
-    - uses: dovecot/[email protected]
-    - uses: dovecot/[email protected]
-      with:
-        FLAGS: -azr --delete
-        HOST: doc.dovecot.org
-        USER: docs
-        LOCALPATH: /build/.
-        REMOTEPATH: public_html/2.3
-        DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-      if: env.DEPLOY_KEY
-      env:
-        DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}

docs/core/plugins/mail_crypt.md

@@ -11,6 +11,9 @@ dovecotlinks:
   mail_crypt_fs_crypt:
     hash: fs-crypt
     text: "Mail Crypt Plugin: fs-crypt"
+  mail_crypt_global_keys:
+    hash: global-keys
+    text: "Mail Crypt Plugin: Global Keys"
   mail_crypt_supported_sym_algorithms:
     hash: supported-symmetric-algorithms
     text: "Mail Crypt Plugin: Supported symmetric algorithms"
@@ -221,9 +224,13 @@ when the password changes, **you must re-encrypt the user private key**.
 
 ### Global keys
 
-In this mode, all keying material is taken from plugin environment. You can use
-either Elliptic Curve (EC) keys (recommended) or RSA keys. No key generation
-is automatically performed.
+In this mode, all keying material is taken from the settings:
+ * [[setting,crypt_global_public_key_file]]
+ * [[setting,crypt_global_private_key]] - List of
+   [[setting,crypt_private_key_file]] keys
+
+You can use either Elliptic Curve (EC) keys (recommended) or RSA keys. See
+below for examples using them. No key generation is automatically performed.
 
 A good solution for environments where no user folder sharing is needed is to
 generate per-user EC key pair and encrypt that with something derived from
@@ -262,9 +269,9 @@ mail_plugins {
   mail_crypt = yes
 }
 
-crypt_global_public_key_file = rsapubkey.pem
+crypt_global_public_key_file = ecpubkey.pem
 crypt_global_private_key main {
-  crypt_private_key_file = rsaprivkey.pem
+  crypt_private_key_file = ecprivkey.pem
   crypt_private_password = secret
 }
 ```