3729: Allow setting collation via env variable and add uvloop r=mergify[bot] a=Grennith
## What type of PR?
Enhancement / Bugfix
## What does this PR do?
As of https://github.com/Mailu/Mailu/pull/3701, the collation shall be set by overwriting `SQLALCHEMY_DATABASE_URI` to contain the collation of the related DB. However, this is currently not possible in the Helm chart of Mailu at all. It's statically set there and would also require not setting DB_NAME etc. to not have it overwritten, see https://github.com/Mailu/Mailu/blob/master/core/admin/mailu/configuration.py#L144
Additionally, uvloop is added to the prod requirements of which postfix-mta-sts-resolver makes use of.
### Related issue(s)
- Mention an issue like: #3449
## 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
- [ ] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
Co-authored-by: Till Skrodzki <till@mueskro.de>
My previous fix attempt only made it clear that the issue was
in the runtime and an upstream issue with Webpack, but did not
really fix things.
Since Webpack 5.96.0, especially since
420d0d0eed
Webpack does not generate JS for asset chunks, which breaks having
a single entry with both JS and asset chunks.
The logo can easily be moved to a separate entry.
With https://github.com/Mailu/Mailu/pull/3701 the remark was left to set the DB collation for MariaDB setups. However, the Helm chart has no option to overwrite the SQLAlchemy URI really. It selfs DB_USER, DB_PW, DB_NAME and DB_HOST and thus triggers the Alchemy URI to be overwritten (and it overwrites it statically as well...).
This commit adds the parameter / environment variable DB_APPENDIX allowing for, e.g., '?collation=utf8mb4_unicode_ci' to be set using an environment variable which the Helm chart can then set.
3304: Update translations: regenerate .pot, update english and german r=mergify[bot] a=Dennis14e
## What type of PR?
Enhancement
## What does this PR do?
Updates the translations .pot-file and the english and german translations.
I tried to reproduce the change using run_dev.sh, but it only shows me the English language - even without my changes. I used GitHub Codespaces, maybe it has something to do with that?
## 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.
- [ ] In case of feature or enhancement: documentation updated accordingly
- [ ] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
Co-authored-by: Dennis Neufeld <Dennis14e@users.noreply.github.com>
Co-authored-by: Alexander Graf <ghostwheel42@users.noreply.github.com>
3350: Feature: dkim for alternative domains r=mergify[bot] a=Jumper78
## What type of PR?
feature
## What does this PR do?
### General Idea
#### use same DKIM key of main domain for signing
Instead of dealing with key creation for each alternative domain, this implementation of the solution uses one key for all domains, the main domain and all alternative domains. Upon Rspamd requesting the DKIM key of a domain, it is not only checked if the domain is in the list of main domains, it also checked if it part of the alternative domains. If it is in this list, it sends the DKIM key of the connected main domain together with the name of the alternative domain.
#### show needed entries in the domain detailed view of the main domain
To make it easier for the admin to create the DKIM and DMARC entries (and the MX and SPF entries) for the alternative domains, we go through all alternative domains and print the entries.
### missing (and currently not planned to be added)
The zonefile at the top of the detail page will still only cover the main domain.
### Related issue(s)
- DKIM signing of the alternative domains is a requested feature; it closes#1519
- it keeps the original file based handling of DKIM keys; it does not implement #2952
## 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.
- [ ] 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: Jumper78 <52802286+Jumper78@users.noreply.github.com>
code goes through all of the alternative domain names and displays:
- name of the alternative domain
- DNS MX entry
- DNS SPF entry
- if main domain has DKIM key: DNS DKIM entry
- if main domain has DKIM key: DNS DMARC entry
file modified: core/admin/mailu/models.py
file modified: core/admin/mailu/ui/templates/domain/details.html
When rspamd looks up the DKIM key of the domains, also the alternative domains are queried. In case there is a match, the admin container is providing the DKIM key of the domain belonging to the alternative domain.
file modified: core/admin/mailu/internal/views/rspamd.py
3307: ports not in PORTS should not be bound r=nextgens a=nextgens
## What type of PR?
bug-fix
## What does this PR do?
Ensure we only bind ports that do feature in PORTS.
Previously we would bind ports 110 and 143 even though we shouldn't have.
### Related issue(s)
## 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.
- [ ] 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: Florent Daigniere <nextgens@freenetproject.org>
Co-authored-by: Florent Daigniere <nextgens@users.noreply.github.com>
