From edf4652212e71d11ab88829a8c6be0d4c072847a Mon Sep 17 00:00:00 2001
From: root <root@mail.steinle-computer.de>
Date: Mon, 13 Jan 2025 08:22:41 +0000
Subject: [PATCH] Add DNS for roundcube to find mailserver.

---
 mail/docker-compose.yaml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/mail/docker-compose.yaml b/mail/docker-compose.yaml
index b67fcef..300cb9c 100644
--- a/mail/docker-compose.yaml
+++ b/mail/docker-compose.yaml
@@ -22,6 +22,8 @@ volumes:
     name: roundcube-config
   roundcube-db:
     name: roundcube-db
+  rainloop:
+    name: rainloop
 
 services:
   mailserver:
@@ -42,7 +44,7 @@ services:
     environment:
       - ENABLE_FAIL2BAN=1
       - SSL_TYPE=letsencrypt
-      - PERMIT_DOCKER=none
+      - PERMIT_DOCKER=mail
       - ONE_DIR=1
       - ENABLE_POSTGREY=1
       - ENABLE_CLAMAV=1
@@ -81,14 +83,16 @@ services:
       - "traefik.tcp.services.sieve.loadbalancer.server.port=4190"
 
   roundcube:
-    image: roundcubeorg/roundcubemail:latest-apache
+    image: roundcube/roundcubemail:latest-apache
     container_name: roundcube
     hostname: roundcube
     domainname: steinle-computer.de
+    dns:
+      - '8.8.8.8'
     environment:
       - ROUNDCUBEMAIL_DEFAULT_HOST=ssl://mail.steinle-computer.de
       - ROUNDCUBEMAIL_DEFAULT_PORT=993
-      - ROUNDCUBEMAIL_SMTP_SERVER=ssl://mail.steinle-computer.de
+      - ROUNDCUBEMAIL_SMTP_SERVER=tls://mail.steinle-computer.de
       - ROUNDCUBEMAIL_SMTP_PORT=465
       - ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE=30M
       - ROUNDCUBEMAIL_DB_TYPE=mysql
@@ -100,16 +104,17 @@ services:
     restart: unless-stopped
     volumes:
       - roundcube-config:/var/roundcube/config
+      - letsencrypt:/etc/letsencrypt/
     networks:
       - proxy
       - mail
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.roundcube.rule=Host(`webmail.steinle-computer.de`, `mail.steinle-computer.de`)"
+      - "traefik.http.routers.roundcube.rule=Host(`webmail.steinle-computer.de`)"
       - "traefik.http.routers.roundcube.entrypoints=web"
       - "traefik.http.routers.roundcube.middlewares=roundcube"
       - "traefik.http.middlewares.roundcube.redirectscheme.scheme=https"
-      - "traefik.http.routers.roundcube-secure.rule=Host(`webmail.steinle-computer.de`, `mail.steinle-computer.de`)"
+      - "traefik.http.routers.roundcube-secure.rule=Host(`webmail.steinle-computer.de`)"
       - "traefik.http.routers.roundcube-secure.entrypoints=websecure"
       - "traefik.http.routers.roundcube-secure.tls=true"
       - "traefik.http.routers.roundcube-secure.tls.certresolver=cs"
@@ -120,7 +125,6 @@ services:
     image: mysql:8
     container_name: roundcube-db
     hostname: roundcube-db
-    command: --default-authentication-plugin=mysql_native_password
     restart: unless-stopped
     environment:
       MYSQL_ROOT_PASSWORD: 6mqqZP4pSKnbxF8HQYGrb6fnyQw4Bf