mirror of
https://github.com/Mailu/Mailu.git
synced 2024-12-14 10:53:30 +02:00
Merge #2033
2033: Misc r=nextgens a=nextgens ## What type of PR? bug-fix ## What does this PR do? - Remove /dkim from the rspamd container in setup as that's not necessary anymore; `@micw` helms-chart should probably be updated too. There is an open question on whether we want to keep it on admin. We can either have DKIM keys auto-imported to the DB on upgrade (if they exist) or provide a facility to manually import them (so that the directory can be removed altogether). Having the former doesn't allow for removing /dkim from admin. `@Diman0` any opinion on what we want for 1.9? - Remove spam points from RCVD_NO_TLS_LAST as we don't detect whether TLS was used or not. ### Related issue(s) - close #1705 ## 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: Florent Daigniere <nextgens@freenetproject.org>
This commit is contained in:
commit
c5694cfb47
4
core/rspamd/conf/settings.conf
Normal file
4
core/rspamd/conf/settings.conf
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
apply {
|
||||||
|
# see https://github.com/Mailu/Mailu/issues/1705
|
||||||
|
RCVD_NO_TLS_LAST = 0;
|
||||||
|
}
|
@ -90,7 +90,6 @@ services:
|
|||||||
env_file: {{ env }}
|
env_file: {{ env }}
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ root }}/filter:/var/lib/rspamd"
|
- "{{ root }}/filter:/var/lib/rspamd"
|
||||||
- "{{ root }}/dkim:/dkim:ro"
|
|
||||||
- "{{ root }}/overrides/rspamd:/etc/rspamd/override.d:ro"
|
- "{{ root }}/overrides/rspamd:/etc/rspamd/override.d:ro"
|
||||||
depends_on:
|
depends_on:
|
||||||
- front
|
- front
|
||||||
|
@ -74,7 +74,6 @@ services:
|
|||||||
env_file: {{ env }}
|
env_file: {{ env }}
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ root }}/filter:/var/lib/rspamd"
|
- "{{ root }}/filter:/var/lib/rspamd"
|
||||||
- "{{ root }}/dkim:/dkim:ro"
|
|
||||||
- "{{ root }}/overrides/rspamd:/etc/rspamd/override.d:ro"
|
- "{{ root }}/overrides/rspamd:/etc/rspamd/override.d:ro"
|
||||||
deploy:
|
deploy:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
|
1
towncrier/newsfragments/1705.enhancement
Normal file
1
towncrier/newsfragments/1705.enhancement
Normal file
@ -0,0 +1 @@
|
|||||||
|
Ensure that RCVD_NO_TLS_LAST doesn't add to the spam score (as TLS usage can't be determined)
|
Loading…
Reference in New Issue
Block a user