diff --git a/test/docker_mail/templates/docker-compose.yml b/test/docker_mail/templates/docker-compose.yml index c09d5fd26314e49cfcb779fa1fb6c20c81eeb945..d244115aab15e517743e73800e827d8065681ac5 100644 --- a/test/docker_mail/templates/docker-compose.yml +++ b/test/docker_mail/templates/docker-compose.yml @@ -34,20 +34,11 @@ services: options: tag: mailu-front ports: - - "{{ ext_ip4 }}:25:25" - - "{{ ext_ip6 }}:25:25" - - "{{ ext_ip4 }}:465:465" - - "{{ ext_ip6 }}:465:465" - - "{{ ext_ip4 }}:587:587" - - "{{ ext_ip6 }}:587:587" - - "{{ ext_ip4 }}:110:110" - - "{{ ext_ip6 }}:110:110" - - "{{ ext_ip4 }}:995:995" - - "{{ ext_ip6 }}:995:995" - - "{{ ext_ip4 }}:143:143" - - "{{ ext_ip6 }}:143:143" - - "{{ ext_ip4 }}:993:993" - - "{{ ext_ip6 }}:993:993" + - "25:25" #smtp + - "465:465" #submissions + - "587:587" #submission + - "143:143" #imap + - "993:993" #imaps labels: - "traefik.enable=true" - "traefik.http.routers.{{ servicename }}.entrypoints=websecure" @@ -150,9 +141,6 @@ services: driver: journald options: tag: mailu-antispam - networks: - - default - - noinet volumes: - "{{ basedir }}/mailu/filter:/var/lib/rspamd" - "{{ basedir }}/mailu/overrides/rspamd:/overrides:ro" @@ -161,6 +149,10 @@ services: - redis - oletools - resolver + networks: + default: + ipv4_address: 192.168.203.253 + noinet: dns: - 192.168.203.254 diff --git a/test/docker_mail/templates/mailu.env b/test/docker_mail/templates/mailu.env index 7c84a63d95048a938547b84ab0cd99248dde283a..6ca40d0c4bcaf799565ec27e4b02ed8fa30f1183 100644 --- a/test/docker_mail/templates/mailu.env +++ b/test/docker_mail/templates/mailu.env @@ -11,6 +11,9 @@ INITIAL_ADMIN_DOMAIN={{ domain }} INITIAL_ADMIN_PW={{ mailu_admin_pass }} INITIAL_ADMIN_MODE=ifmissing +# force internel connect to rspamd with ipv4 +ANTISPAM_ADDRESS=192.168.203.253 + ################################### # Common configuration variables ###################################