From a8a543036303f076f4a444379b028d8f0aec8180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= <qyg2297248353@163.com>
Date: Wed, 28 Aug 2024 15:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 萌森 <qyg2297248353@163.com>
---
 apps/mailserver/14.0.0/data.yml           | 28 +++++++++++++++++++++++
 apps/mailserver/14.0.0/docker-compose.yml |  6 +++++
 2 files changed, 34 insertions(+)

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