Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 43 additions & 37 deletions data/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -10189,15 +10189,6 @@ The Subject: header to use for bounce messages.
See [[setting,rejection_reason]] for the list of variables that can be used.`
},

sendmail_path: {
default: '/usr/sbin/sendmail',
values: setting_types.STRING,
text: `
The binary to use for sending email.

Used only if [[setting,submission_host]] is not set.`
},

service: {
tags: [ 'service' ],
values: setting_types.NAMED_LIST_FILTER,
Expand Down Expand Up @@ -10925,15 +10916,57 @@ Supported workaround identifiers are:
between 'RCPT TO:' and path.`
},

sendmail_path: {
tags: [ 'outgoing_mail' ],
default: '/usr/sbin/sendmail',
values: setting_types.STRING,
text: `
The binary to use for sending email.

Used only if [[setting,submission_host]] is not set.`
},

submission_host: {
tags: [ 'submission' ],
tags: [ 'outgoing_mail' ],
seealso: [ 'submission_ssl'],
values: setting_types.URL,
text: `
Use this SMTP submission host to send messages.

Overrides [[setting,sendmail_path]] value, if set.`
},

submission_ssl: {
tags: [ 'outgoing_mail' ],
default: 'no',
seealso: [ 'submission_host' ],
values: setting_types.STRING,
values_enum: [ 'no', 'smtps', 'starttls' ],
text: `
If enabled, use SSL/TLS to connect to [[setting,submission_host]].

Available values:

\`no\`
: No SSL connection is used.

\`smtps\`
: An SMTPS connection (immediate SSL) is used.

\`starttls\`
: The STARTTLS command is used to establish the TLS layer.

Used only if [[setting,submission_host]] is set.`
},

submission_timeout: {
tags: [ 'outgoing_mail' ],
default: '30secs',
seealso: [ 'submission_host' ],
values: setting_types.TIME,
text: `Timeout for submitting outgoing messages.`
},

submission_logout_format: {
default: 'in=%{input} out=%{output}',
tags: [ 'submission' ],
Expand Down Expand Up @@ -11086,33 +11119,6 @@ relay server (only if enabled).`
User name for authentication to the relay MTA if authentication is required.`
},

submission_ssl: {
default: 'no',
seealso: [ 'submission_host' ],
values: setting_types.STRING,
values_enum: [ 'no', 'smtps', 'starttls' ],
text: `
If enabled, use SSL/TLS to connect to [[setting,submission_host]].

Available values:

\`no\`
: No SSL connection is used.

\`smtps\`
: An SMTPS connection (immediate SSL) is used.

\`starttls\`
: The STARTTLS command is used to establish the TLS layer.`
},

submission_timeout: {
default: '30secs',
seealso: [ 'submission_host' ],
values: setting_types.TIME,
text: `Timeout for submitting outgoing messages.`
},

syslog_facility: {
default: 'mail',
values: setting_types.STRING,
Expand Down
14 changes: 9 additions & 5 deletions docs/core/config/sieve/submission.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,16 @@ passdb sql {
}
```

## `submission_host`
## Outgoing Mail

`submission_host = smtp-out.example.com:25`

SMTP server which is used for sending email rejects, Sieve forwards,
vacations, etc.
The `submission_host` setting configures the SMTP server used for sending email
rejects, Sieve forwards, vacation notifications, etc.

Alternatively, `sendmail_path` setting can be used to send mails using the
sendmail binary.
Alternatively, the `sendmail_path` setting can be used to send mails using the
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[[setting,sendmail_path]]

local sendmail binary.

The following settings apply to outgoing mail submitted from Sieve:

<SettingsComponent tag="outgoing_mail" />