mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
Fix several typos (#2993)
This commit is contained in:
parent
6ac59ef871
commit
dcf34fd63b
|
@ -101,7 +101,7 @@ MUA <---- STARTTLS ---- ┤(143) MDA ╯ |
|
||||||
┗━━━━━━━━━━ Retrieval ━━━━━━━━━━┛
|
┗━━━━━━━━━━ Retrieval ━━━━━━━━━━┛
|
||||||
```
|
```
|
||||||
|
|
||||||
If you're new to email infrastructure, both that table and the schema may be confusing.
|
If you're new to email infrastructure, both that table and the schema may be confusing.
|
||||||
Read on to expand your understanding and learn about `docker-mailserver`'s configuration, including how you can customize it.
|
Read on to expand your understanding and learn about `docker-mailserver`'s configuration, including how you can customize it.
|
||||||
|
|
||||||
### Submission - SMTP
|
### Submission - SMTP
|
||||||
|
@ -145,7 +145,7 @@ The best practice as of 2020 when it comes to securing Outward Submission is to
|
||||||
- Port 465 is the reserved TCP port for Implicit TLS Submission (since 2018). There is actually a boisterous history to that ports usage, but let's keep it simple.
|
- Port 465 is the reserved TCP port for Implicit TLS Submission (since 2018). There is actually a boisterous history to that ports usage, but let's keep it simple.
|
||||||
|
|
||||||
!!! warning
|
!!! warning
|
||||||
This Submission setup is sometimes refered to as [SMTPS][wikipedia-smtps]. Long story short: this is incorrect and should be avoided.
|
This Submission setup is sometimes referred to as [SMTPS][wikipedia-smtps]. Long story short: this is incorrect and should be avoided.
|
||||||
|
|
||||||
Although a very satisfactory setup, Implicit TLS on port 465 is somewhat "cutting edge". There exists another well established mail Submission setup that must be supported as well, SMTP+STARTTLS on port 587. It uses Explicit TLS: the client starts with a cleartext connection, then the server informs a TLS-encrypted "upgraded" connection may be established, and the client _may_ eventually decide to establish it prior to the Submission. Basically it's an opportunistic, opt-in TLS upgrade of the connection between the client and the server, at the client's discretion, using a mechanism known as [STARTTLS][wikipedia-starttls] that both ends need to implement.
|
Although a very satisfactory setup, Implicit TLS on port 465 is somewhat "cutting edge". There exists another well established mail Submission setup that must be supported as well, SMTP+STARTTLS on port 587. It uses Explicit TLS: the client starts with a cleartext connection, then the server informs a TLS-encrypted "upgraded" connection may be established, and the client _may_ eventually decide to establish it prior to the Submission. Basically it's an opportunistic, opt-in TLS upgrade of the connection between the client and the server, at the client's discretion, using a mechanism known as [STARTTLS][wikipedia-starttls] that both ends need to implement.
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Wrapper for 'sed -i': fail if file was not modified by sed and container was not restarted.
|
# Wrapper for 'sed -i': fail if file was not modified by sed and container was not restarted.
|
||||||
# Error output is surpressed, when container is restarted to avoid harmless error messages.
|
# Error output is suppressed, when container is restarted to avoid harmless error messages.
|
||||||
# Use "--strict" as first parameter, to fail regardless of the container state (fresh or restarted).
|
# Use "--strict" as first parameter, to fail regardless of the container state (fresh or restarted).
|
||||||
|
|
||||||
# When to use sedfile?
|
# When to use sedfile?
|
||||||
|
|
|
@ -30,7 +30,7 @@ plugin {
|
||||||
|
|
||||||
# You can execute a given command when user exceeds a specified quota limit.
|
# You can execute a given command when user exceeds a specified quota limit.
|
||||||
# Each quota root has separate limits. Only the command for the first
|
# Each quota root has separate limits. Only the command for the first
|
||||||
# exceeded limit is excecuted, so put the highest limit first.
|
# exceeded limit is executed, so put the highest limit first.
|
||||||
# The commands are executed via script service by connecting to the named
|
# The commands are executed via script service by connecting to the named
|
||||||
# UNIX socket (quota-warning below).
|
# UNIX socket (quota-warning below).
|
||||||
# Note that % needs to be escaped as %%, otherwise "% " expands to empty.
|
# Note that % needs to be escaped as %%, otherwise "% " expands to empty.
|
||||||
|
|
|
@ -14,7 +14,7 @@ passdb {
|
||||||
#args = dovecot
|
#args = dovecot
|
||||||
}
|
}
|
||||||
|
|
||||||
# System users (NSS, /etc/passwd, or similiar).
|
# System users (NSS, /etc/passwd, or similar).
|
||||||
# In many systems nowadays this uses Name Service Switch, which is
|
# In many systems nowadays this uses Name Service Switch, which is
|
||||||
# configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
|
# configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
|
||||||
#passdb {
|
#passdb {
|
||||||
|
@ -23,7 +23,7 @@ passdb {
|
||||||
#args =
|
#args =
|
||||||
#}
|
#}
|
||||||
|
|
||||||
# Shadow passwords for system users (NSS, /etc/shadow or similiar).
|
# Shadow passwords for system users (NSS, /etc/shadow or similar).
|
||||||
# Deprecated by PAM nowadays.
|
# Deprecated by PAM nowadays.
|
||||||
# <doc/wiki/PasswordDatabase.Shadow.txt>
|
# <doc/wiki/PasswordDatabase.Shadow.txt>
|
||||||
#passdb {
|
#passdb {
|
||||||
|
@ -44,7 +44,7 @@ passdb {
|
||||||
## User databases
|
## User databases
|
||||||
##
|
##
|
||||||
|
|
||||||
# System users (NSS, /etc/passwd, or similiar). In many systems nowadays this
|
# System users (NSS, /etc/passwd, or similar). In many systems nowadays this
|
||||||
# uses Name Service Switch, which is configured in /etc/nsswitch.conf.
|
# uses Name Service Switch, which is configured in /etc/nsswitch.conf.
|
||||||
userdb {
|
userdb {
|
||||||
# <doc/wiki/AuthDatabase.Passwd.txt>
|
# <doc/wiki/AuthDatabase.Passwd.txt>
|
||||||
|
|
|
@ -30,7 +30,7 @@ teardown_file() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "checking postfix-lmtp: delivers mail to existing account" {
|
@test "checking postfix-lmtp: delivers mail to existing account" {
|
||||||
# maybe we can move this into the setup to speed things up futher.
|
# maybe we can move this into the setup to speed things up further.
|
||||||
# this likely would need an async coroutine to avoid blocking the other tests while waiting for the server to come up
|
# this likely would need an async coroutine to avoid blocking the other tests while waiting for the server to come up
|
||||||
wait_for_smtp_port_in_container mail_lmtp_ip
|
wait_for_smtp_port_in_container mail_lmtp_ip
|
||||||
run docker exec mail_lmtp_ip /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-user1.txt"
|
run docker exec mail_lmtp_ip /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-user1.txt"
|
||||||
|
|
|
@ -126,7 +126,7 @@ BATS_TEST_NAME_PREFIX='test helper functions:'
|
||||||
run cat "${path}/marker"
|
run cat "${path}/marker"
|
||||||
assert_line "This marker file is there to identify the correct config being copied"
|
assert_line "This marker file is there to identify the correct config being copied"
|
||||||
|
|
||||||
run duplicate_config_for_container non-existant-source-folder "${BATS_TEST_NAME}2"
|
run duplicate_config_for_container non-existent-source-folder "${BATS_TEST_NAME}2"
|
||||||
assert_failure
|
assert_failure
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue