finnished

.gitignore

@@ -6,3 +6,4 @@ mailqueue
 overrides
 redis
 mailu.env
+.env

docker-compose.yaml

@@ -5,11 +5,11 @@ services:
     restart: unless-stopped
     env_file: mailu.env
     ports:
-      - "25:25"
-      - "587:587"
-      - "993:993"
+      - "2525:25"
+      - "2465:465"
+      - "2993:993"
     volumes:
-      - ./certs:/certs
+      - ${CADDY_MAIL_CERT_DIR}:/certs:ro
       - ./overrides/nginx:/overrides:ro
     depends_on:
       - resolver
@@ -34,7 +34,7 @@ services:
     container_name: mailu-redis
     restart: unless-stopped
     volumes:
-      - ./redis:/data
+      - mailu_redis:/data
     networks:
       mailu_net:
         ipv4_address: 192.168.203.3
@@ -45,8 +45,8 @@ services:
     restart: unless-stopped
     env_file: mailu.env
     volumes:
-      - ./data:/data
-      - ./dkim:/dkim
+      - mailu_data:/data
+      - mailu_dkim:/dkim
     depends_on:
       - redis
       - resolver
@@ -62,7 +62,7 @@ services:
     restart: unless-stopped
     env_file: mailu.env
     volumes:
-      - ./mail:/mail
+      - mailu_mail:/mail
       - ./overrides/dovecot:/overrides:ro
     depends_on:
       - resolver
@@ -78,7 +78,7 @@ services:
     restart: unless-stopped
     env_file: mailu.env
     volumes:
-      - ./mailqueue:/queue
+      - mailu_mailqueue:/queue
       - ./overrides/postfix:/overrides:ro
     depends_on:
       - resolver
@@ -94,39 +94,40 @@ services:
     restart: unless-stopped
     env_file: mailu.env
     volumes:
-      - ./filter:/var/lib/rspamd
-      - ./dkim:/dkim
+      - mailu_filter:/var/lib/rspamd
+      - mailu_dkim:/dkim
       - ./overrides/rspamd:/overrides:ro
     depends_on:
       - resolver
-    #  - clamav
+      - antivirus
     dns:
       - 192.168.203.254
     networks:
       mailu_net:
         ipv4_address: 192.168.203.7
 
-#  clamav:
- #   image: ghcr.io/mailu/clamav:2024.06
-  #  container_name: mailu-clamav
-   # restart: unless-stopped
-   # env_file: mailu.env
-   # volumes:
-   #   - ./filter/clamav:/data
-   # networks:
-   #   mailu_net:
-   #     ipv4_address: 192.168.203.8
+  antivirus:
+    image: clamav/clamav-debian:1.4_base
+    container_name: mailu-antivirus
+    restart: unless-stopped
+    volumes:
+      - mailu_clamav:/var/lib/clamav
+    networks:
+      mailu_net:
+        ipv4_address: 192.168.203.8
 
   webmail:
-    image: ghcr.io/mailu/roundcube:2024.06
+    image: ghcr.io/mailu/webmail:2024.06
     container_name: mailu-webmail
     restart: unless-stopped
     env_file: mailu.env
     volumes:
-      - ./webmail:/data
+      - mailu_webmail:/data
     depends_on:
       - imap
       - smtp
+    dns:
+      - 192.168.203.254
     networks:
       mailu_net:
         ipv4_address: 192.168.203.9
@@ -140,3 +141,13 @@ networks:
 
   proxy_net:
     external: true
+volumes:
+#  mailu_certs:
+  mailu_data:
+  mailu_dkim:
+  mailu_filter:
+  mailu_mail:
+  mailu_mailqueue:
+  mailu_redis:
+  mailu_webmail:
+  mailu_clamav: