From 8debd6a2c2de1a2e510f3c5bb96c50ecc11c79e2 Mon Sep 17 00:00:00 2001
From: Kohei Watanabe <kou029w@gmail.com>
Date: Wed, 19 Apr 2023 19:48:17 +0900
Subject: [PATCH] fixed config errors

---
 etc/mox/config/domains.conf | 18 +++++++++---------
 etc/mox/config/mox.conf     |  9 +++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/etc/mox/config/domains.conf b/etc/mox/config/domains.conf
index 134cbf2..dd63ae4 100644
--- a/etc/mox/config/domains.conf
+++ b/etc/mox/config/domains.conf
@@ -1,6 +1,6 @@
 Domains:
 	fogtype.com:
-		LocalpartCatchallSeparator: "+"
+		LocalpartCatchallSeparator: +
 		DKIM:
 			Selectors:
 			Sign: []
@@ -9,9 +9,9 @@ Domains:
 			Account: nebel
 			Mailbox: DMARC
 		MTASTS:
-			PolicyID: "20230420T000000"
+			PolicyID: 20230420T000000
 			Mode: enforce
-			MaxAge: "24h"
+			MaxAge: 24h
 		TLSRPT:
 			Localpart: tls-reports
 			Account: nebel
@@ -22,17 +22,17 @@ Accounts:
 		Destinations:
 			nebel:
 		SubjectPass:
-			Period: "12h"
+			Period: 12h
 		RejectsMailbox: Rejects
 		AutomaticJunkFlags:
 			Enabled: true
-			JunkMailboxRegexp: "^(junk|spam)"
-			NeutralMailboxRegexp: "^(inbox|neutral|postmaster|dmarc|tlsrpt|rejects)"
+			JunkMailboxRegexp: ^(junk|spam)
+			NeutralMailboxRegexp: ^(inbox|neutral|postmaster|dmarc|tlsrpt|rejects)
 		JunkFilter:
-			Threshold: "0.95"
+			Threshold: 0.95
 			Params:
 				Onegrams: true
-				MaxPower: "0.01"
+				MaxPower: 0.01
 				TopWords: 10
-				IgnoreWords: "0.1"
+				IgnoreWords: 0.1
 				RareWords: 2
diff --git a/etc/mox/config/mox.conf b/etc/mox/config/mox.conf
index fd80425..2999ba3 100644
--- a/etc/mox/config/mox.conf
+++ b/etc/mox/config/mox.conf
@@ -7,7 +7,7 @@ AdminPasswordFile: adminpasswd
 Listeners:
 	internal:
 		IPs:
-			- "127.0.0.1"
+			- 127.0.0.1
 		AccountHTTP:
 			Enabled: true
 		AdminHTTP:
@@ -20,11 +20,12 @@ Listeners:
 			NonTLS: true
 	public:
 		IPs:
-			- "::"
+			- ::
 		TLS:
 			KeyCerts:
-				- CertFile: /var/lib/caddy/data/caddy/certificates/acme-v02.api.letsencrypt.org-directory/fogtype.com/fogtype.com.crt
-				  KeyFile: /var/lib/caddy/data/caddy/certificates/acme-v02.api.letsencrypt.org-directory/fogtype.com/fogtype.com.key
+				-
+					CertFile: /var/lib/caddy/data/caddy/certificates/acme-v02.api.letsencrypt.org-directory/fogtype.com/fogtype.com.crt
+					KeyFile: /var/lib/caddy/data/caddy/certificates/acme-v02.api.letsencrypt.org-directory/fogtype.com/fogtype.com.key
 		SMTP:
 			Enabled: true
 		Submissions: