From 53353a603b221eee7a5010ef612ad45acfeac093 Mon Sep 17 00:00:00 2001
From: Teck Meng <furyx@hotmail.com>
Date: Thu, 13 Jun 2024 11:50:55 +0800
Subject: [PATCH] Refactor mailserver.yml to add volumes and env_file for
 Docker Mailserver

---
 swarm/mailserver.yml                   | 12 ++++++------
 swarm/mailserver/docker-mailserver.env |  9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 swarm/mailserver/docker-mailserver.env

diff --git a/swarm/mailserver.yml b/swarm/mailserver.yml
index caa6182..720e830 100644
--- a/swarm/mailserver.yml
+++ b/swarm/mailserver.yml
@@ -1,6 +1,12 @@
 services:
   mail:
     image: tvial/docker-mailserver:latest
+    env_file: /var/data/docker-mailserver/docker-mailserver.env
+    volumes:
+      - /var/data/docker-mailserver/maildata:/var/mail
+      - /var/data/docker-mailserver/mailstate:/var/mail-state
+      - /var/data/docker-mailserver/config:/tmp/docker-mailserver
+      - /var/data/docker-mailserver/letsencrypt:/etc/letsencrypt
     ports:
       - target: 25
         published: 25
@@ -18,12 +24,6 @@ services:
         published: 995
         protocol: tcp
         mode: host
-    volumes:
-      - /var/data/docker-mailserver/maildata:/var/mail
-      - /var/data/docker-mailserver/mailstate:/var/mail-state
-      - /var/data/docker-mailserver/config:/tmp/docker-mailserver
-      - /var/data/docker-mailserver/letsencrypt:/etc/letsencrypt
-    env_file: /var/data/docker-mailserver/docker-mailserver.env
     networks:
       - internal
 
diff --git a/swarm/mailserver/docker-mailserver.env b/swarm/mailserver/docker-mailserver.env
new file mode 100644
index 0000000..9ead7ca
--- /dev/null
+++ b/swarm/mailserver/docker-mailserver.env
@@ -0,0 +1,9 @@
+ENABLE_SPAMASSASSIN=1
+ENABLE_CLAMAV=1
+ENABLE_POSTGREY=1
+ONE_DIR=1
+OVERRIDE_HOSTNAME=mail.furyhawk.lol
+OVERRIDE_DOMAINNAME=mail.furyhawk.lol
+POSTMASTER_ADDRESS=admin@furyhawk.lol
+PERMIT_DOCKER=network
+SSL_TYPE=letsencrypt
\ No newline at end of file