feat: 管理后台一键从 Caddy 获取证书 + TLS 证书热加载
- 域名编辑页新增“从 Caddy 获取证书”按钮:一键把本机 Caddy 已签发的 证书与私钥导入该域名的 TLS 目录并自动启用 TLS,支持通配符证书 (如 *.example.com 可匹配 mail.example.com),成功/失败均回显横幅 - 新增 internal/caddycert:搜索 Caddy 证书存储(同步镜像目录优先、 caddy.data_dir 与常见位置兜底),校验密钥对/有效期/SAN,并给出 可操作的中文错误提示(未找到/证书无效/权限不足) - install.sh 新增 setup-caddy-cert:安装 root 权限的 systemd path+timer 同步任务(mailgo-caddy-sync),把 Caddy 证书树镜像到 /srv/mail_go/tls/caddy(证书续期后自动更新、每日兜底),另授予 ACL 作为直接读取兜底;install 时自动检测并配置 - 新增 [caddy] data_dir 配置节,支持自定义 Caddy 数据目录 - 新增 internal/tlsutil:TLS 证书热加载器,每次握手按需重载证书 文件(mtime 检测),重载失败继续使用旧证书兜底并节流重试; 应用于 SMTPS 465/IMAPS 993/POP3S 995 与 STARTTLS,导入或上传 新证书后无需重启服务即生效 - 证书来源动态切换:协议显式配置优先,否则取首个启用 TLS 且有证书 的域名(10 秒缓存),新域名一键导入证书后自动切换 - 更新 README 与界面文案(去掉“重启服务生效”提示)
This commit is contained in:
@@ -79,6 +79,15 @@ type BanConfig struct {
|
||||
BanDurationMin int `toml:"ban_duration_min"` // Default: 30 (minutes)
|
||||
}
|
||||
|
||||
// CaddyConfig holds settings for importing TLS certificates from a local Caddy.
|
||||
type CaddyConfig struct {
|
||||
// DataDir is the Caddy data directory (the one containing the
|
||||
// "certificates/" subdirectory), used by the one-click certificate
|
||||
// import in the admin panel. Leave empty to auto-detect common
|
||||
// locations such as /var/lib/caddy/.local/share/caddy.
|
||||
DataDir string `toml:"data_dir"`
|
||||
}
|
||||
|
||||
// OutboundConfig holds outbound (external) mail delivery settings.
|
||||
type OutboundConfig struct {
|
||||
Hostname string `toml:"hostname"` // EHLO 主机名,留空使用 [smtp] domain
|
||||
@@ -114,6 +123,7 @@ type Config struct {
|
||||
POP3 POP3Config `toml:"pop3"`
|
||||
Auth AuthConfig `toml:"auth"`
|
||||
Ban BanConfig `toml:"ban"`
|
||||
Caddy CaddyConfig `toml:"caddy"`
|
||||
Outbound OutboundConfig `toml:"outbound"`
|
||||
}
|
||||
|
||||
@@ -184,6 +194,8 @@ func defaultConfig() *Config {
|
||||
MaxFailAttempts: 5,
|
||||
BanDurationMin: 30,
|
||||
},
|
||||
// Caddy: 留空则自动探测常见数据目录,无需配置
|
||||
Caddy: CaddyConfig{},
|
||||
Outbound: OutboundConfig{
|
||||
PollInterval: 15, // 15 秒扫描一次队列
|
||||
MaxAttempts: 12, // 最多尝试 12 次
|
||||
|
||||
Reference in New Issue
Block a user