matrix

playbooks/mail/docker-compose.yml.j2

@@ -6,32 +6,50 @@ services:
   dovecot:
     image: docker.io/dovecot/dovecot:latest
     container_name: dovecot
-    restart: unless-stopped
+    restart: always
     networks:
       - mail
     volumes:
-      - mail_data:/srv/vmail
+      - /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"
-      - "1465:1465"
       - "31587:31587"
       - "31024:31024"
       - "34190:34190"
       - "8080:8080"
-      - "127.0.01:9110:9110"
+      - "127.0.0.1:2424:2424"
+      - "127.0.0.1:9110:9110"
 
   postfix:
     image: git.secretbee.buzz/bee/postfix:latest
     container_name: postfix
-    restart: unless-stopped
+    restart: always
+    pull_policy: always
     networks:
       - mail
     volumes:
-      - /etc/letsencrypt/live/mail.secretbee.buzz/fullchain.pem:/etc/postfix/fullchain.pem
-      - /etc/letsencrypt/live/mail.secretbee.buzz/privkey.pem:/etc/postfix/privkey.pem
+      - /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
+    ports:
+      - "25:25"
+      - "587:587"
+
+  opendkim:
+    image: git.secretbee.buzz/bee/opendkim:latest
+    container_name: opendkim
+    restart: always
+    networks:
+      - mail
+    volumes:
+      - /opt/mail/opendkim.conf:/etc/opendkim.conf:ro
+      - /opt/mail/mail.private:/etc/opendkim/keys/mail.private:ro
 
 volumes:
   mail-data: