From a7969b768c5476af3e160b9f59887fc760de1a66 Mon Sep 17 00:00:00 2001
From: Teck Meng <furyx@hotmail.com>
Date: Thu, 13 Jun 2024 13:30:48 +0800
Subject: [PATCH] Refactor mailserver.yml to remove commented out volumes and
 update Traefik routing rules

---
 swarm/mailserver.yml                   | 35 ++++++++++++++++++--------
 swarm/mailserver/docker-mailserver.env |  3 ++-
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/swarm/mailserver.yml b/swarm/mailserver.yml
index 39c7035..df54c26 100644
--- a/swarm/mailserver.yml
+++ b/swarm/mailserver.yml
@@ -3,9 +3,9 @@ services:
     image: mailserver/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/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
@@ -27,10 +27,8 @@ services:
     networks:
       - internal
 
-  rainloop:
-    image: nerzhul/rainloop-arm64
-    volumes:
-      - /var/data/docker-mailserver/rainloop:/rainloop/data
+  whoami:
+    image: docker.io/traefik/whoami:latest
     networks:
       - internal
       - traefik-public
@@ -39,10 +37,25 @@ services:
         - traefik.enable=true
         - traefik.docker.network=traefik-public
         - traefik.constraint-label=traefik-public
-        - traefik.http.routers.rainloop.entrypoints=https
-        - traefik.http.routers.rainloop.rule=Host(`webmail.${DOMAIN}`)
-        - traefik.http.routers.rainloop.tls.certresolver=le
-        - traefik.http.services.rainloop.loadbalancer.server.port=8888
+        - traefik.http.routers.mailwhoami.entrypoints=https
+        - traefik.http.routers.mailwhoami.rule=Host(`mail.${DOMAIN}`)
+
+  # rainloop:
+  #   image: nerzhul/rainloop-arm64
+  #   volumes:
+  #     - /var/data/docker-mailserver/rainloop:/rainloop/data
+  #   networks:
+  #     - internal
+  #     - traefik-public
+  #   deploy:
+  #     labels:
+  #       - traefik.enable=true
+  #       - traefik.docker.network=traefik-public
+  #       - traefik.constraint-label=traefik-public
+  #       - traefik.http.routers.rainloop.entrypoints=https
+  #       - traefik.http.routers.rainloop.rule=Host(`webmail.${DOMAIN}`)
+  #       - traefik.http.routers.rainloop.tls.certresolver=le
+  #       - traefik.http.services.rainloop.loadbalancer.server.port=8888
 
 networks:
   traefik-public:
diff --git a/swarm/mailserver/docker-mailserver.env b/swarm/mailserver/docker-mailserver.env
index 9ead7ca..98fdcea 100644
--- a/swarm/mailserver/docker-mailserver.env
+++ b/swarm/mailserver/docker-mailserver.env
@@ -6,4 +6,5 @@ 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
+SSL_TYPE=letsencrypt
+SSL_DOMAIN=mail.furyhawk.lol
\ No newline at end of file