diff --git a/apps/mailserver/14.0.0/data.yml b/apps/mailserver/14.0.0/data.yml index 97f72bb6..ea19fb9b 100644 --- a/apps/mailserver/14.0.0/data.yml +++ b/apps/mailserver/14.0.0/data.yml @@ -175,3 +175,31 @@ additionalProperties: labelEn: SMTP relay password required: false type: text + - default: "" + edit: true + envKey: http_proxy + labelZh: 网络代理 + labelEn: Network proxy + required: false + type: text + - default: "localhost:127.0.0.1" + edit: true + envKey: DOMAIN_HOSTS1 + labelZh: 固定域名解析 + labelEn: Domain resolution + required: true + type: text + - default: "1.1.1.1" + edit: true + envKey: DNS1 + labelZh: 域名解析 (DNS) + labelEn: Domain resolution (DNS) + required: true + type: text + - default: "114.114.114.114" + edit: true + envKey: DNS2 + labelZh: 域名解析 (备用 DNS) + labelEn: Domain resolution (Backup DNS) + required: true + type: text diff --git a/apps/mailserver/14.0.0/docker-compose.yml b/apps/mailserver/14.0.0/docker-compose.yml index 301d4004..d183ba06 100644 --- a/apps/mailserver/14.0.0/docker-compose.yml +++ b/apps/mailserver/14.0.0/docker-compose.yml @@ -12,6 +12,11 @@ services: networks: - 1panel-network stop_grace_period: 1m + dns: + - ${DNS1} + - ${DNS2} + extra_hosts: + - ${DOMAIN_HOSTS1} hostname: ${HOSTNAME_FQDN} ports: - ${PANEL_APP_PORT_SMTP}:25 @@ -41,6 +46,7 @@ services: - SSL_CERT_PATH=/tmp/dms/certs/${CERTS_PUBLIC_CRT:-public.crt} - SSL_KEY_PATH=/tmp/dms/certs/${CERTS_PRIVATE_KEY:-private.key} - SPOOF_PROTECTION=1 + - https_proxy=${http_proxy} healthcheck: test: "ss --listening --tcp | grep -P 'LISTEN.+:smtp' || exit 1" timeout: 3s