- 04 Apr, 2022 2 commits
-
-
bors[bot] authored
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>
-
bors[bot] authored
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>
-
- 02 Apr, 2022 14 commits
-
-
Florent Daigniere authored
-
Florent Daigniere authored
-
Florent Daigniere authored
-
Florent Daigniere authored
-
Florent Daigniere authored
-
Florent Daigniere authored
-
Florent Daigniere authored
-
Florent Daigniere authored
-
Florent Daigniere authored
-
Florent Daigniere authored
-
spomata authored
(cherry picked from commit 00b78b73507fe63cbde1b2964711cde08088399f)
-
Will authored
(cherry picked from commit 48f92b59917db18c395630ce62725fad7bbf278b)
-
Will authored
(cherry picked from commit a54a784168c023d1f95c2c1ba0cd97659ffbd08c) # Conflicts: # core/admin/Dockerfile # core/dovecot/Dockerfile # core/nginx/Dockerfile # core/none/Dockerfile # core/postfix/Dockerfile # optional/clamav/Dockerfile # optional/fetchmail/Dockerfile # optional/radicale/Dockerfile # optional/unbound/Dockerfile # setup/Dockerfile
-
hitech95 authored
Signed-off-by:
hitech95 <nicveronese@gmail.com> (cherry picked from commit fc8926493c2adc03f2a4104f2b46a3b6a7043782)
-
- 22 Mar, 2022 4 commits
-
-
bors[bot] authored
2294: rspamd may trigger HFILTER_HOSTNAME_UNKNOWN if part of the delivery chain is using ipv6 (backport #2290) r=mergify[bot] a=mergify[bot] This is an automatic backport of pull request #2290 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>
-
Florent Daigniere authored
(cherry picked from commit ca7fc34839938debdf3fdce9e8b32cbe2f6ebd63)
-
Florent Daigniere authored
(cherry picked from commit a88424d19f65d03d9e62140cfdc719d95ddfee5b)
-
Florent Daigniere authored
It creates issues with RSPAMD/HFILTER_HOSTNAME_UNKNOWN on v6 enabled setups see https://github.com/Mailu/Mailu/issues/2260#issuecomment-1066797661 (cherry picked from commit 9b952da6c2ab1dbee2165697fb16979fc168a6af)
-
- 19 Mar, 2022 1 commit
-
-
bors[bot] authored
2288: Fixing AUTH_RATELIMIT_IP not working on imap/pop3/smtp (backport #2284) r=mergify[bot] a=mergify[bot] This is an automatic backport of pull request #2284 done by [Mergify](https://mergify.com). Cherry-pick of 64ad6931e993b5867ea5eec38d4ecd554d101a74 has failed: ``` On branch mergify/bp/1.9/pr-2284 Your branch is ahead of 'origin/1.9' by 3 commits. (use "git push" to publish your local commits) You are currently cherry-picking commit 64ad6931. (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/mailu/internal/nginx.py 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:
Maximilian Fischer <github@maaeps.de> Co-authored-by:
Alexander Graf <ghostwheel42@users.noreply.github.com>
-
- 18 Mar, 2022 6 commits
-
-
Alexander Graf authored
-
Alexander Graf authored
(cherry picked from commit 64ad6931e993b5867ea5eec38d4ecd554d101a74) # Conflicts: # core/admin/mailu/internal/nginx.py
-
Alexander Graf authored
Add spaces (cherry picked from commit 630a4e9b5e18d301c83f8e49de366656c44d0857)
-
Maximilian Fischer authored
(cherry picked from commit dcfe0fbe91a5b48d0143ee41229de7d0d9a7dcf5)
-
Maximilian Fischer authored
#2283 (cherry picked from commit 8775dc5b155d7ad97672f1eb5b47a9dd01031211)
-
bors[bot] authored
2282: Fixed typo in Traefik reverse proxy docs r=nextgens a=DAHPr0gram3r Slight typo in the Traefik reverse proxy docs. Found through running into the issue on my own instance. ## What type of PR? Documentation (Feature, enhancement, bug-fix, documentation) ## What does this PR do? Fixes Typo in docs regarding using Traefik as a reverse proxy ### Related issue(s) N/A ## Prerequisites Before we can consider review and merge, please make sure the following list is done and checked. If an entry in not applicable, you can check it or remove it from the list. - [X] In case of feature or enhancement: documentation updated accordingly - [X] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog ) entry file. Co-authored-by:
DAHPr0gram3r <cbillwork02@gmail.com>
-
- 17 Mar, 2022 1 commit
-
-
DAHPr0gram3r authored
Slight typo in the Traefik reverse proxy docs. Found through running into the issue on my own instance.
-
- 24 Feb, 2022 5 commits
-
-
bors[bot] authored
2257: Send ISRG_X1 on port 25, make DANE pin that (backport #2254) r=mergify[bot] a=mergify[bot] This is an automatic backport of pull request #2254 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>
-
Florent Daigniere authored
(cherry picked from commit f9869b1d796c3f69a929c769ffa6ecd9cdeb1d51)
-
Florent Daigniere authored
(cherry picked from commit ab35492589ea5f0fead61e90e3b3a95927a608ed)
-
Florent Daigniere authored
(cherry picked from commit 0816cb9497f31ca4ee71aebdee97b87e71870cc8)
-
Florent Daigniere authored
(cherry picked from commit e4a32b55f5da3d8b4bde025f0964aab5b7744482)
-
- 23 Feb, 2022 7 commits
-
-
bors[bot] authored
2256: Workaround the infamous coredns feature (backport #2253) r=mergify[bot] a=mergify[bot] This is an automatic backport of pull request #2253 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> Co-authored-by:
Dimitri Huisman <diman@huisman.xyz>
-
Dimitri Huisman authored
(cherry picked from commit c40a0f4b807055cbe6b507f49891ef7a0de3b41a)
-
Dimitri Huisman authored
(cherry picked from commit dfd5e441bda803ff72e3225d565ff577adbf784e)
-
Florent Daigniere authored
(cherry picked from commit 0abbf2ba4a23bc43ba7483fee28e0ca10ef15dbb)
-
Florent Daigniere authored
(cherry picked from commit 1364451a9e7c730e51018768af42f4803c4dfa6b)
-
Florent Daigniere authored
(cherry picked from commit d3e7ea5389a31cc6e3eade27acb57f81aac82682)
-
Florent Daigniere authored
(cherry picked from commit a8dc20962ad6bb9562ed59033d2ecb6bf2cec981)
-