mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2025-08-28 22:08:42 +02:00
refactor: Internal HOSTNAME and DOMAINNAME configuration (#2280)
Better logical flow, handling and inline documentation. Despite the verbosity, it's better to make this visible here for maintenance and debugging purposes than trying to dig through issue/PR or commit history for it. * fix: Panic when HOSTNAME is misconfigured * chore: Add more comment docs for maintainers * tests(fix): Use `--domainname` not ENV `DOMAINNAME` Co-authored-by: Casper <casperklein@users.noreply.github.com> Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
This commit is contained in:
parent
30834eb250
commit
584577787a
2 changed files with 60 additions and 22 deletions
|
@ -35,9 +35,9 @@ function setup_file() {
|
|||
-e PERMIT_DOCKER=network \
|
||||
-e DMS_DEBUG=0 \
|
||||
-e ENABLE_SRS=1 \
|
||||
-e SRS_DOMAINNAME=srs.my-domain.com \
|
||||
-e DOMAINNAME=my-domain.com \
|
||||
-h unknown.domain.tld \
|
||||
-e SRS_DOMAINNAME='srs.my-domain.com' \
|
||||
--domainname 'my-domain.com' \
|
||||
--hostname 'mail' \
|
||||
-t "${NAME}"
|
||||
|
||||
PRIVATE_CONFIG_FOUR="$(duplicate_config_for_container . mail_domainname)"
|
||||
|
@ -47,14 +47,14 @@ function setup_file() {
|
|||
-e PERMIT_DOCKER=network \
|
||||
-e DMS_DEBUG=0 \
|
||||
-e ENABLE_SRS=1 \
|
||||
-e DOMAINNAME=my-domain.com \
|
||||
-h unknown.domain.tld \
|
||||
--domainname 'my-domain.com' \
|
||||
--hostname 'mail' \
|
||||
-t "${NAME}"
|
||||
|
||||
wait_for_smtp_port_in_container mail_override_hostname
|
||||
|
||||
|
||||
wait_for_smtp_port_in_container mail_non_subdomain_hostname
|
||||
|
||||
|
||||
wait_for_smtp_port_in_container mail_srs_domainname
|
||||
|
||||
wait_for_smtp_port_in_container mail_domainname
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue