mail

playbooks/mail/docker-compose.yml.j2

@@ -1,55 +1,23 @@
-networks:
-  mail:
-    external: false
-
-services:
-  dovecot:
-    image: docker.io/dovecot/dovecot:latest
-    container_name: dovecot
-    restart: always
-    networks:
-      - mail
-    volumes:
-      - /opt/mail/99-local.conf:/etc/dovecot/conf.d/99-local.conf:ro
-      - /opt/mail/users:/etc/dovecot/users:ro
-      - mail-data:/srv/vmail
-    ports:
-      - "31143:31143"
-      - "31993:31993"
-      - "31110:31110"
-      - "31995:31995"
-      - "31587:31587"
-      - "31024:31024"
-      - "34190:34190"
-      - "8080:8080"
-      - "127.0.0.1:2424:2424"
-      - "127.0.0.1:9110:9110"
-
-  postfix:
-    image: git.secretbee.buzz/bee/postfix:latest
-    container_name: postfix
-    restart: always
-    pull_policy: always
-    networks:
-      - mail
-    volumes:
-      - /etc/letsencrypt/live/mail.secretbee.buzz/fullchain.pem:/etc/postfix/fullchain.pem:ro
-      - /etc/letsencrypt/live/mail.secretbee.buzz/privkey.pem:/etc/postfix/privkey.pem:ro
-      - /opt/mail/main.cf:/etc/postfix/main.cf:ro
-      - /opt/mail/master.cf:/etc/postfix/master.cf:ro
+services: # https://docker-mailserver.github.io/docker-mailserver/latest/
+  mailserver:
+    image: ghcr.io/docker-mailserver/docker-mailserver:latest
+    container_name: mailserver
+    hostname: mail.secretbee.buzz
+    env_file: mailserver.env
     ports:
       - "25:25"
+      - "143:143"
+      - "465:465"
       - "587:587"
-
-  opendkim:
-    image: git.secretbee.buzz/bee/opendkim:latest
-    container_name: opendkim
-    restart: always
-    networks:
-      - mail
+      - "993:993"
     volumes:
-      - /opt/mail/opendkim.conf:/etc/opendkim.conf:ro
-      - /opt/mail/mail.private:/etc/opendkim/keys/mail.private:ro
-
-volumes:
-  mail-data:
+      - /opt/beeserver/mail/mail-data/:/var/mail/
+      - /opt/beeserver/mail/mail-state/:/var/mail-state/
+      - /opt/beeserver/mail/mail-logs/:/var/log/mail/
+      - /opt/beeserver/mail/config/:/tmp/docker-mailserver/
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/letsencrypt:/etc/letsencrypt
+    restart: always
+    stop_grace_period: 1m
+    cap_add:
+      - NET_ADMIN