This reverts commit 69dc7eb2

2351: Silence some errors in nginx (backport #2348) r=mergify[bot] a=mergify[bot]

This is an automatic backport of pull request #2348 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com


</details>


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>

"could not be resolved (3: Host not found) while in resolving client
address, client:"

(cherry picked from commit cb656fc9fdf05f88c8ef8709b63e8bb19d8a2046)

2337: helm-chart is now in sync; update the wording (backport #2336) r=mergify[bot] a=mergify[bot]

This is an automatic backport of pull request #2336 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com


</details>


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>

(cherry picked from commit e80bcfbfd047807aaee35141c9c51aaa53a312f2)

(cherry picked from commit 4ff9582e139654dfbb84c972a5f88d40cb2337c0)

(cherry picked from commit ebf378aaae2890f989227af8deea3f0a52505106)

2324: Fix Postfix FileExistsError on startup (backport #2323) r=mergify[bot] a=mergify[bot]

This is an automatic backport of pull request #2323 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com


</details>


Co-authored-by: Pumba98 <mail@pumba98.de>
Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>

(cherry picked from commit 193d835abeb91928a8c59cbf1345056c4f32b4c1)

(cherry picked from commit f1952d0e971581bbe72be9eb5538dff1508b7856)

2318: Add pytz module to webdav container (backport #2317) r=mergify[bot] a=mergify[bot]

This is an automatic backport of pull request #2317 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com


</details>


Co-authored-by: Alexander Graf <ghostwheel42@users.noreply.github.com>

(cherry picked from commit bb0a96c6f7d48e116165eaf7434f1c9a05ff1d29)

2307: admin: graceful fail on user fetch in basic auth (backport #2299) r=mergify[bot] a=mergify[bot]

This is an automatic backport of pull request #2299 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>


2309: Adding missing semicolon after remote_addr (backport #2305) r=mergify[bot] a=mergify[bot]

This is an automatic backport of pull request #2305 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com


</details>


Co-authored-by: hitech95 <nicveronese@gmail.com>
Co-authored-by: spomata <49432438+spomata@users.noreply.github.com>

2308: Update alpine-linux to 3.14.5 - Zlib security FIX (backport #2302) r=mergify[bot] a=mergify[bot]

This is an automatic backport of pull request #2302 done by [Mergify](https://mergify.com).
Cherry-pick of a54a784168c023d1f95c2c1ba0cd97659ffbd08c has failed:
```
On branch mergify/bp/1.9/pr-2302
Your branch is up to date with 'origin/1.9'.

You are currently cherry-picking commit a54a7841.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/admin/Dockerfile
	both modified:   core/dovecot/Dockerfile
	both modified:   core/nginx/Dockerfile
	both modified:   core/none/Dockerfile
	both modified:   core/postfix/Dockerfile
	both modified:   optional/clamav/Dockerfile
	both modified:   optional/fetchmail/Dockerfile
	both modified:   optional/radicale/Dockerfile
	both modified:   optional/unbound/Dockerfile
	both modified:   setup/Dockerfile

no changes added to commit (use "git add" and/or "git commit -a")
```


To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- ``@Mergifyio` refresh` will re-evaluate the rules
- ``@Mergifyio` rebase` will rebase this PR on its base branch
- ``@Mergifyio` update` will merge the base branch into this PR
- ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com


</details>


Co-authored-by: Will <will@packer-output-c8fcfb40-3d93-4475-8f87-e14a9dd683b6>
Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>