diff --git a/docker-compose/mail-relay/docker-compose.yml.j2 b/docker-compose/mail-relay/docker-compose.yml.j2 index 92d6f65d..abc82acf 100644 --- a/docker-compose/mail-relay/docker-compose.yml.j2 +++ b/docker-compose/mail-relay/docker-compose.yml.j2 @@ -2,7 +2,7 @@ version: '3.3' services: postfix: image: "registry.mgrote.net/postfix:latest" - container_name: mail-relay + container_name: postfix restart: always ports: - 1025:25 @@ -23,9 +23,9 @@ services: # rewrite FROM "nobody@lldap" to "lldap@mgrote.net" # /.*/ würde alle absender adressen ersetzen networks: - - mail-relay + - postfix ######## Networks ######## networks: - mail-relay: + postfix: external: true diff --git a/docker-compose/munin/docker-compose.yml.j2 b/docker-compose/munin/docker-compose.yml.j2 index 83aec959..38f1bcab 100644 --- a/docker-compose/munin/docker-compose.yml.j2 +++ b/docker-compose/munin/docker-compose.yml.j2 @@ -6,7 +6,7 @@ services: restart: always environment: MAILCONTACT: michael.grote@posteo.de - MAILSERVER: mail-relay + MAILSERVER: postfix MAILPORT: 25 MAILFROM: munin@mgrote.net MAILUSER: munin@mgrote.net @@ -39,5 +39,5 @@ volumes: cache: networks: - mail-relay: + postfix: external: true diff --git a/docker-compose/nextcloud/docker-compose.yml.j2 b/docker-compose/nextcloud/docker-compose.yml.j2 index 8b24ec93..8d5b1d00 100644 --- a/docker-compose/nextcloud/docker-compose.yml.j2 +++ b/docker-compose/nextcloud/docker-compose.yml.j2 @@ -107,7 +107,7 @@ services: networks: - intern - traefik - - mail-relay + - postfix healthcheck: test: ["CMD", "curl", "-f", "--insecure", "http://localhost:80"] interval: 30s @@ -137,7 +137,7 @@ networks: driver: bridge traefik: external: true - mail-relay: + postfix: external: true ######## Volumes ######## volumes: diff --git a/docker-compose/unifi-network-application/docker-compose.yml.j2 b/docker-compose/unifi-network-application/docker-compose.yml.j2 index ad1942d7..40e298b9 100644 --- a/docker-compose/unifi-network-application/docker-compose.yml.j2 +++ b/docker-compose/unifi-network-application/docker-compose.yml.j2 @@ -29,7 +29,7 @@ services: - 5514:5514/udp #optional restart: always networks: - - mail-relay + - postfix - unifi-internal healthcheck: test: ["CMD", "curl", "-f", "--insecure", "https://localhost:8443"] @@ -66,7 +66,7 @@ volumes: unifi-data: ######## Networks ######## networks: - mail-relay: + postfix: external: true unifi-internal: driver: bridge diff --git a/friedhof/lldap/docker-compose.yml.j2 b/friedhof/lldap/docker-compose.yml.j2 index 9911f1df..4ede0131 100644 --- a/friedhof/lldap/docker-compose.yml.j2 +++ b/friedhof/lldap/docker-compose.yml.j2 @@ -13,7 +13,7 @@ services: networks: - intern - traefik - - mail-relay + - postfix volumes: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro @@ -33,7 +33,7 @@ services: LLDAP_SMTP_OPTIONS__ENABLE_PASSWORD_reset: true LLDAP_SMTP_OPTIONS__FROM: "LLDAP Admin " LLDAP_SMTP_OPTIONS__REPLY_TO: "Do not reply " - LLDAP_SMTP_OPTIONS__SERVER: mail-relay + LLDAP_SMTP_OPTIONS__SERVER: postfix LLDAP_SMTP_OPTIONS__PORT: 25 LLDAP_SMTP_OPTIONS__SMTP_ENCRYPTION: NONE LLDAP_SMTP_OPTIONS__USER: info@mgrote.net @@ -69,5 +69,5 @@ networks: intern: traefik: external: true - mail-relay: + postfix: external: true diff --git a/host_vars/docker10.mgrote.net.yml b/host_vars/docker10.mgrote.net.yml index 06b97aac..a614829e 100644 --- a/host_vars/docker10.mgrote.net.yml +++ b/host_vars/docker10.mgrote.net.yml @@ -56,9 +56,9 @@ compose_files: network: traefik - name: routeros-config-export state: present - - name: mail-relay + - name: postfix state: present - network: mail-relay + network: postfix - name: woodpecker state: present network: traefik