fix(stalwart-mail): correct default values

This commit is contained in:
WrenIX 2024-03-21 15:30:48 +01:00
parent 566d70c60e
commit acd6f96fae
Signed by: wrenix
GPG key ID: 7AFDB012974B1BB5
3 changed files with 88 additions and 41 deletions

View file

@ -3,7 +3,7 @@ name: stalwart-mail
description: Helm Chart for Stalwart Mail Server - Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP) description: Helm Chart for Stalwart Mail Server - Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)
icon: https://stalw.art/home/apple-touch-icon.png icon: https://stalw.art/home/apple-touch-icon.png
type: application type: application
version: 0.0.3 version: 0.0.4
# renovate: image=docker.io/stalwartlabs/mail-server # renovate: image=docker.io/stalwartlabs/mail-server
appVersion: "0.6.0" appVersion: "0.6.0"
maintainers: maintainers:

View file

@ -2,7 +2,7 @@
= stalwart-mail = stalwart-mail
image::https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square[Version: 0.0.3] image::https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square[Version: 0.0.4]
image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application] image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
image::https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square[AppVersion: 0.6.0] image::https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square[AppVersion: 0.6.0]
== Maintainers == Maintainers
@ -322,7 +322,7 @@ helm uninstall stalwart-mail-release
| config.queue.outbound | config.queue.outbound
| object | object
| `{"ip-strategy":"ipv4-then-ipv6","limits":{"multihomed":2,"mx":7},"next-hop":[{"if":"rcpt-domain","in-list":"%{DEFAULT_DIRECTORY}%/domains","then":"local"},{"else":false}],"timeouts":{"connect":"3m","data":"10m","ehlo":"3m","greeting":"3m","mail-from":"3m","mta-sts":"2m","rcpt-to":"3m","tls":"2m"},"tls":{"allow-invalid-certs":false,"dane":"optional","mta-sts":"optional","starttls":"require"}}` | `{"ip-strategy":"ipv4_then_ipv6","limits":{"multihomed":2,"mx":7},"next-hop":[{"if":"is_local_domain('%{DEFAULT_DIRECTORY}%', rcpt_domain)","then":"'local'"},{"else":false}],"timeouts":{"connect":"3m","data":"10m","ehlo":"3m","greeting":"3m","mail-from":"3m","mta-sts":"2m","rcpt-to":"3m","tls":"2m"},"tls":{"allow-invalid-certs":false,"dane":"optional","mta-sts":"optional","starttls":"require"}}`
| queue-outbound | queue-outbound
| config.queue.path | config.queue.path
@ -330,11 +330,46 @@ helm uninstall stalwart-mail-release
| `"/data/queue"` | `"/data/queue"`
| queue-path | queue-path
| config.queue.quota[0].key
| string
| `nil`
|
| config.queue.quota[0].key[0]
| string
| `"rcpt"`
|
| config.queue.quota[0].match
| string
| `nil`
|
| config.queue.quota[0].messages
| int
| `100000`
|
| config.queue.quota[0].size
| int
| `10737418240`
|
| config.queue.schedule | config.queue.schedule
| object | object
| `{"expire":"5d","notify":["1d","3d"],"retry":["2m","5m","10m","15m","30m","1h","2h"]}` | `{"expire":"5d","notify":"[1d, 3d]","retry":"[2m, 5m, 10m, 15m, 30m, 1h, 2h]"}`
| queue-schedule | queue-schedule
| config.queue.throttle[0].concurrency
| int
| `5`
|
| config.queue.throttle[0].key[0]
| string
| `"rcpt_domain"`
|
| config.report.analysis | config.report.analysis
| object | object
| `{"addresses":["dmarc@*","abuse@*","postmaster@*"],"forward":true}` | `{"addresses":["dmarc@*","abuse@*","postmaster@*"],"forward":true}`
@ -342,12 +377,12 @@ helm uninstall stalwart-mail-release
| config.report.dkim | config.report.dkim
| object | object
| `{"from-address":"noreply-dkim@%{DEFAULT_DOMAIN}%","from-name":"Report Subsystem","send":"1/1d","sign":["rsa"],"subject":"DKIM Authentication Failure Report"}` | `{"from-address":"'noreply-dkim@%{DEFAULT_DOMAIN}%'","from-name":"'Report Subsystem'","send":"[1, 1d]","sign":"['rsa']","subject":"'DKIM Authentication Failure Report'"}`
| report-dkim | report-dkim
| config.report.dmarc | config.report.dmarc
| object | object
| `{"aggregate":{"from-address":"noreply-dmarc@%{DEFAULT_DOMAIN}%","from-name":"DMARC Report","max-size":26214400,"org-name":"%{DEFAULT_DOMAIN}%","send":"daily","sign":["rsa"]},"from-address":"noreply-dmarc@%{DEFAULT_DOMAIN}%","from-name":"Report Subsystem","send":"1/1d","sign":["rsa"],"subject":"DMARC Authentication Failure Report"}` | `{"aggregate":{"from-address":"'noreply-dmarc@%{DEFAULT_DOMAIN}%'","from-name":"'DMARC Report'","max-size":26214400,"org-name":"'%{DEFAULT_DOMAIN}%'","send":"daily","sign":"['rsa']"},"from-address":"'noreply-dmarc@%{DEFAULT_DOMAIN}%'","from-name":"'Report Subsystem'","send":"[1, 1d]","sign":"['rsa']","subject":"'DMARC Authentication Failure Report'"}`
| report-dmarc | report-dmarc
| config.report.dmarc.aggregate.max-size | config.report.dmarc.aggregate.max-size
@ -357,7 +392,7 @@ helm uninstall stalwart-mail-release
| config.report.dsn | config.report.dsn
| object | object
| `{"from-address":"MAILER-DAEMON@%{DEFAULT_DOMAIN}%","from-name":"Mail Delivery Subsystem","sign":["rsa"]}` | `{"from-address":"'MAILER-DAEMON@%{DEFAULT_DOMAIN}%'","from-name":"'Mail Delivery Subsystem'","sign":"['rsa']"}`
| report-dsn | report-dsn
| config.report.hash | config.report.hash
@ -372,12 +407,12 @@ helm uninstall stalwart-mail-release
| config.report.spf | config.report.spf
| object | object
| `{"from-address":"noreply-spf@%{DEFAULT_DOMAIN}%","from-name":"Report Subsystem","send":"1/1d","sign":["rsa"],"subject":"SPF Authentication Failure Report"}` | `{"from-address":"'noreply-spf@%{DEFAULT_DOMAIN}%'","from-name":"'Report Subsystem'","send":"[1, 1d]","sign":"['rsa']","subject":"'SPF Authentication Failure Report'"}`
| report-spf | report-spf
| config.report.tls | config.report.tls
| object | object
| `{"aggregate":{"from-address":"noreply-tls@%{DEFAULT_DOMAIN}%","from-name":"TLS Report","max-size":26214400,"org-name":"%{DEFAULT_DOMAIN}%","send":"daily","sign":["rsa"]}}` | `{"aggregate":{"from-address":"'noreply-tls@%{DEFAULT_DOMAIN}%'","from-name":"'TLS Report'","max-size":26214400,"org-name":"'%{DEFAULT_DOMAIN}%'","send":"daily","sign":"['rsa']"}}`
| report-tls | report-tls
| config.report.tls.aggregate.max-size | config.report.tls.aggregate.max-size

View file

@ -441,19 +441,18 @@ config:
# -- queue-schedule # -- queue-schedule
schedule: schedule:
retry: ["2m", "5m", "10m", "15m", "30m", "1h", "2h"] retry: "[2m, 5m, 10m, 15m, 30m, 1h, 2h]"
notify: ["1d", "3d"] notify: "[1d, 3d]"
expire: "5d" expire: "5d"
# -- queue-outbound # -- queue-outbound
outbound: outbound:
# hostname: "%{HOST}%" # hostname: "%{HOST}%"
next-hop: next-hop:
- if: "rcpt-domain" - if: "is_local_domain('%{DEFAULT_DIRECTORY}%', rcpt_domain)"
in-list: "%{DEFAULT_DIRECTORY}%/domains" then: "'local'"
then: "local"
- else: false - else: false
ip-strategy: "ipv4-then-ipv6" ip-strategy: "ipv4_then_ipv6"
tls: tls:
dane: "optional" dane: "optional"
mta-sts: "optional" mta-sts: "optional"
@ -471,6 +470,19 @@ config:
rcpt-to: "3m" rcpt-to: "3m"
data: "10m" data: "10m"
mta-sts: "2m" mta-sts: "2m"
quota:
- match:
# match: "sender_domain = 'foobar.org'"
# key: ["rcpt"]
key:
messages: 100000
# 10gb
size: 10737418240
throttle:
- key: ["rcpt_domain"]
# rate: "100/1h"
rate:
concurrency: 5
## ##
@ -492,54 +504,54 @@ config:
# -- report-dsn # -- report-dsn
dsn: dsn:
from-name: "Mail Delivery Subsystem" from-name: "'Mail Delivery Subsystem'"
from-address: "MAILER-DAEMON@%{DEFAULT_DOMAIN}%" from-address: "'MAILER-DAEMON@%{DEFAULT_DOMAIN}%'"
sign: ["rsa"] sign: "['rsa']"
# -- report-dkim # -- report-dkim
dkim: dkim:
from-name: "Report Subsystem" from-name: "'Report Subsystem'"
from-address: "noreply-dkim@%{DEFAULT_DOMAIN}%" from-address: "'noreply-dkim@%{DEFAULT_DOMAIN}%'"
subject: "DKIM Authentication Failure Report" subject: "'DKIM Authentication Failure Report'"
sign: ["rsa"] sign: "['rsa']"
send: "1/1d" send: "[1, 1d]"
# -- report-spf # -- report-spf
spf: spf:
from-name: "Report Subsystem" from-name: "'Report Subsystem'"
from-address: "noreply-spf@%{DEFAULT_DOMAIN}%" from-address: "'noreply-spf@%{DEFAULT_DOMAIN}%'"
subject: "SPF Authentication Failure Report" subject: "'SPF Authentication Failure Report'"
send: "1/1d" sign: "['rsa']"
sign: ["rsa"] send: "[1, 1d]"
# -- report-dmarc # -- report-dmarc
dmarc: dmarc:
from-name: "Report Subsystem" from-name: "'Report Subsystem'"
from-address: "noreply-dmarc@%{DEFAULT_DOMAIN}%" from-address: "'noreply-dmarc@%{DEFAULT_DOMAIN}%'"
subject: "DMARC Authentication Failure Report" subject: "'DMARC Authentication Failure Report'"
send: "1/1d" sign: "['rsa']"
sign: ["rsa"] send: "[1, 1d]"
aggregate: aggregate:
from-name: "DMARC Report" from-name: "'DMARC Report'"
from-address: "noreply-dmarc@%{DEFAULT_DOMAIN}%" from-address: "'noreply-dmarc@%{DEFAULT_DOMAIN}%'"
org-name: "%{DEFAULT_DOMAIN}%" org-name: "'%{DEFAULT_DOMAIN}%'"
# contact-info: "" # contact-info: ""
send: "daily" send: "daily"
# -- default: 25 mb # -- default: 25 mb
max-size: 26214400 max-size: 26214400
sign: ["rsa"] sign: "['rsa']"
# -- report-tls # -- report-tls
tls: tls:
aggregate: aggregate:
from-name: "TLS Report" from-name: "'TLS Report'"
from-address: "noreply-tls@%{DEFAULT_DOMAIN}%" from-address: "'noreply-tls@%{DEFAULT_DOMAIN}%'"
org-name: "%{DEFAULT_DOMAIN}%" org-name: "'%{DEFAULT_DOMAIN}%'"
# contact-info: "" # contact-info: ""
send: "daily" send: "daily"
# -- default: 25 mb # -- default: 25 mb
max-size: 26214400 max-size: 26214400
sign: ["rsa"] sign: "['rsa']"
## ##