From c1462047e46a46c36299c5badaf6faf764c9a970 Mon Sep 17 00:00:00 2001
From: Kohei Watanabe <nebel@fogtype.com>
Date: Thu, 4 May 2023 16:21:56 +0900
Subject: [PATCH] replace mox to maddy

---
 compose.yml                 | 31 +++++++++----------------
 etc/mox/config/domains.conf | 45 -------------------------------------
 etc/mox/config/mox.conf     | 39 --------------------------------
 3 files changed, 11 insertions(+), 104 deletions(-)
 delete mode 100644 etc/mox/config/domains.conf
 delete mode 100644 etc/mox/config/mox.conf

diff --git a/compose.yml b/compose.yml
index 8971817..73ca9a4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -65,34 +65,25 @@ services:
     restart: unless-stopped
     networks:
       - fogtype
-  mox:
-    image: r.xmox.nl/mox:v0.0.3-go1.20.3-alpine3.17.3@sha256:12f8a485d8a19cb31625da84d685897acf49568241d350fc6a0dc5e68dbc3cab
-    restart: on-failure
-    network_mode: host
+  maddy:
+    image: foxcpp/maddy:0.6.3
+    restart: unless-stopped
+    ports:
+      - "25:25"
+      - "465:465"
+      - "993:993"
     environment:
-      MOX_DOCKER: "yes"
+      MADDY_HOSTNAME: fogtype.com
+      MADDY_DOMAIN: fogtype.com
     volumes:
       - caddy_data:/var/lib/caddy/data:ro
-      - mox_data:/mox/data
-      - mox_config:/mox/config
-      - type: bind
-        source: ./etc/mox/config/mox.conf
-        target: /mox/config/mox.conf
-      - type: bind
-        source: ./etc/mox/config/domains.conf
-        target: /mox/config/domains.conf
-    healthcheck:
-      test: "netstat -nlt | grep ':25 '"
-      interval: "1s"
-      timeout: "1s"
-      retries: 10
+      - maddy_data:/data
 volumes:
   caddy_data:
   caddy_config:
   gotosocial_data:
   vikunja_data:
-  mox_data:
-  mox_config:
+  maddy_data:
 networks:
   fogtype:
     ipam:
diff --git a/etc/mox/config/domains.conf b/etc/mox/config/domains.conf
deleted file mode 100644
index 9a83d2c..0000000
--- a/etc/mox/config/domains.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-Domains:
-	fogtype.com:
-		LocalpartCatchallSeparator: +
-		DKIM:
-			Selectors:
-				2023a:
-					Expiration: 72h
-					PrivateKeyFile: dkim/2023a._domainkey.fogtype.com.key.pkcs8.pem
-				2023b:
-					Expiration: 72h
-					PrivateKeyFile: dkim/2023b._domainkey.fogtype.com.key.pkcs8.pem
-			Sign:
-				- 2023a
-		DMARC:
-			Localpart: dmarc-reports
-			Account: nebel
-			Mailbox: DMARC
-		MTASTS:
-			PolicyID: 20230420T000000
-			Mode: enforce
-			MaxAge: 24h
-		TLSRPT:
-			Localpart: tls-reports
-			Account: nebel
-			Mailbox: TLSRPT
-Accounts:
-	nebel:
-		Domain: fogtype.com
-		Destinations:
-			nebel: nil
-		SubjectPass:
-			Period: 12h
-		RejectsMailbox: Rejects
-		AutomaticJunkFlags:
-			Enabled: true
-			JunkMailboxRegexp: ^(junk|spam)
-			NeutralMailboxRegexp: ^(inbox|neutral|postmaster|dmarc|tlsrpt|rejects)
-		JunkFilter:
-			Threshold: 0.95
-			Params:
-				Onegrams: true
-				MaxPower: 0.01
-				TopWords: 10
-				IgnoreWords: 0.1
-				RareWords: 2
diff --git a/etc/mox/config/mox.conf b/etc/mox/config/mox.conf
deleted file mode 100644
index b621e93..0000000
--- a/etc/mox/config/mox.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-DataDir: ../data
-LogLevel: info
-User: 1000
-Hostname: fogtype.com
-CheckUpdates: true
-AdminPasswordFile: adminpasswd
-Listeners:
-	internal:
-		IPs:
-			- 127.0.0.1
-		AccountHTTP:
-			Enabled: true
-			Port: 8080
-		AdminHTTP:
-			Enabled: true
-			Port: 8080
-		MetricsHTTP:
-			Enabled: true
-		MTASTSHTTPS:
-			Enabled: true
-			Port: 8081
-			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
-		SMTP:
-			Enabled: true
-		Submissions:
-			Enabled: true
-		IMAPS:
-			Enabled: true
-Postmaster:
-	Account: nebel
-	Mailbox: Postmaster