Merge branch 'master' into revert-macos-logic

.github/workflows/contributors.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: delete-old-branch
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Create contributors-update branch
         uses: peterjgrainger/action-create-branch@v2.1.0

.github/workflows/default_on_push.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
@@ -62,7 +62,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
@@ -97,13 +97,13 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1.14.0
+        uses: docker/login-action@v1.14.1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.14.0
+        uses: docker/login-action@v1.14.1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/docs-preview-prepare.yml

@@ -26,7 +26,7 @@ jobs:
       NETLIFY_SITE_PREFIX: pullrequest-${{ github.event.pull_request.number }}
       NETLIFY_SITE_NAME: dms-doc-previews
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3
 
       - name: 'Build with mkdocs-material via Docker'
         working-directory: docs

.github/workflows/docs-production-deploy.yml

@@ -26,7 +26,7 @@ jobs:
     name: 'Deploy Docs'
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3
 
       - name: 'Check if deploy is for a `v<major>.<minor>` tag version instead of `edge`'
         if: startsWith(github.ref, 'refs/tags/')
@@ -75,10 +75,10 @@ jobs:
     needs: deploy
     steps:
       - name: 'Checkout the tagged commit (shallow clone)'
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
 
       - name: 'Checkout the docs deployment branch to a subdirectory'
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
         with:
           ref: gh-pages
           path: gh-pages

.github/workflows/linting.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 

.github/workflows/scheduled_builds.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
@@ -31,13 +31,13 @@ jobs:
         id: buildx
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1.14.0
+        uses: docker/login-action@v1.14.1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.14.0
+        uses: docker/login-action@v1.14.1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/test_merge_requests.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 

docs/content/config/environment.md

@@ -317,11 +317,11 @@ Defines who sends reports (if they are enabled).
 
 ##### LOGROTATE_INTERVAL
 
-Changes the interval in which a report is being sent.
+Changes the interval in which log files are rotated.
 
-- **weekly** => Rotate weekly.
-- daily => Rotate daily.
-- monthly => Rotate monthly.
+- **weekly** => Rotate log files weekly
+- daily => Rotate log files daily
+- monthly => Rotate log files monthly
 
 !!! note
 

mailserver.env

@@ -233,17 +233,19 @@ REPORT_RECIPIENT=
 # => Specify the sender address
 REPORT_SENDER=
 
-# Changes the interval in which a report is being sent.
-# **weekly** => Send a report every week
-# daily => Send a daily report
-# monthly => Send a report every month
+# Changes the interval in which log files are rotated
+# **weekly** => Rotate log files weekly
+# daily => Rotate log files daily
+# monthly => Rotate log files monthly
 #
 # Note: This Variable actually controls logrotate inside the container
-# and rotates the log depending on this setting. The main log output is
+# and rotates the log files depending on this setting. The main log output is
 # still available in its entirety via `docker logs mail` (Or your
 # respective container name). If you want to control logrotation for
 # the Docker-generated logfile see:
 # https://docs.docker.com/config/containers/logging/configure/
+#
+# Note: This variable can also determine the interval for Postfix's log summary reports, see [`PFLOGSUMM_TRIGGER`](#pflogsumm_trigger).
 LOGROTATE_INTERVAL=weekly
 
 # Choose TCP/IP protocols for postfix to use