From b195d9ec052a6453f2794838fd4f38319e0e3280 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 22:47:23 +0200 Subject: [PATCH 1/8] ff --- docker-compose/mail-relay/docker-compose.yml.j2 | 6 +++--- docker-compose/munin/docker-compose.yml.j2 | 4 ++-- docker-compose/nextcloud/docker-compose.yml.j2 | 4 ++-- .../unifi-network-application/docker-compose.yml.j2 | 4 ++-- friedhof/lldap/docker-compose.yml.j2 | 6 +++--- host_vars/docker10.mgrote.net.yml | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) 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 -- 2.43.0 From 0bb47857a9fccae8b632dc82c87f5981b4b2e9c5 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 22:47:41 +0200 Subject: [PATCH 2/8] nc --- docker-compose/nextcloud/misc.sh.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/nextcloud/misc.sh.j2 b/docker-compose/nextcloud/misc.sh.j2 index 51446b53..fc59f1fb 100644 --- a/docker-compose/nextcloud/misc.sh.j2 +++ b/docker-compose/nextcloud/misc.sh.j2 @@ -26,7 +26,7 @@ php occ config:system:set logtimezone --value="Europe/Berlin" php occ config:system:set mail_from_address --value="nextcloud@mgrote.net" php occ config:system:set mail_smtpmode --value="smtp" php occ config:system:set mail_sendmailmode --value="smtp" -php occ config:system:set mail_smtphost --value="mail-relay"y +php occ config:system:set mail_smtphost --value="postfix" php occ config:system:set mail_smtpport --value="25" # status -- 2.43.0 From 931c2ee9cc1a470b1f14ad293fe036fc69074ace Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 22:49:23 +0200 Subject: [PATCH 3/8] ff --- host_vars/docker10.mgrote.net.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host_vars/docker10.mgrote.net.yml b/host_vars/docker10.mgrote.net.yml index a614829e..92486d2f 100644 --- a/host_vars/docker10.mgrote.net.yml +++ b/host_vars/docker10.mgrote.net.yml @@ -59,6 +59,8 @@ compose_files: - name: postfix state: present network: postfix + - name: mail-relay + state: absent - name: woodpecker state: present network: traefik -- 2.43.0 From 1c6662aa68e9c19e005467da4f3b72b5fbd6f21e Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 22:51:09 +0200 Subject: [PATCH 4/8] dd --- docker-compose/{mail-relay => postfix}/docker-compose.yml.j2 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose/{mail-relay => postfix}/docker-compose.yml.j2 (100%) diff --git a/docker-compose/mail-relay/docker-compose.yml.j2 b/docker-compose/postfix/docker-compose.yml.j2 similarity index 100% rename from docker-compose/mail-relay/docker-compose.yml.j2 rename to docker-compose/postfix/docker-compose.yml.j2 -- 2.43.0 From 41208078747c45730e363b5119b90db13b17d425 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 22:56:30 +0200 Subject: [PATCH 5/8] dfd --- docker-compose/nextcloud/misc.sh.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/nextcloud/misc.sh.j2 b/docker-compose/nextcloud/misc.sh.j2 index fc59f1fb..1a652c8b 100644 --- a/docker-compose/nextcloud/misc.sh.j2 +++ b/docker-compose/nextcloud/misc.sh.j2 @@ -23,7 +23,7 @@ php occ background:cron php occ config:system:set logtimezone --value="Europe/Berlin" # mail -php occ config:system:set mail_from_address --value="nextcloud@mgrote.net" +php occ config:system:set mail_from_address --value="nextcloud" php occ config:system:set mail_smtpmode --value="smtp" php occ config:system:set mail_sendmailmode --value="smtp" php occ config:system:set mail_smtphost --value="postfix" -- 2.43.0 From c33787a81170c4bed42a086e37d4e559e911d953 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 22:58:56 +0200 Subject: [PATCH 6/8] dd --- docker-compose/postfix/docker-compose.yml.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose/postfix/docker-compose.yml.j2 b/docker-compose/postfix/docker-compose.yml.j2 index abc82acf..d7c2f394 100644 --- a/docker-compose/postfix/docker-compose.yml.j2 +++ b/docker-compose/postfix/docker-compose.yml.j2 @@ -20,6 +20,7 @@ services: /mg@pbs.localdomain/ pbs@mgrote.net /root@pbs.localdomain/ pbs@mgrote.net /root@pve5.localdomain/ pve5@mgrote.net + /no-reply@ubnt.com/ ubiquity@mgrote.net # rewrite FROM "nobody@lldap" to "lldap@mgrote.net" # /.*/ würde alle absender adressen ersetzen networks: -- 2.43.0 From f1a7f5c568250f3afd4570d6ff99a4381bd5701e Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:01:53 +0200 Subject: [PATCH 7/8] ff --- docker-compose/munin/docker-compose.yml.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose/munin/docker-compose.yml.j2 b/docker-compose/munin/docker-compose.yml.j2 index 38f1bcab..a0899ccb 100644 --- a/docker-compose/munin/docker-compose.yml.j2 +++ b/docker-compose/munin/docker-compose.yml.j2 @@ -12,6 +12,7 @@ services: MAILUSER: munin@mgrote.net MAILNAME: Munin MAILDOMAIN: mgrote.net + MAILPASSWORD: "" TZ: Europe/Berlin CRONDELAY: 5 NODES: | -- 2.43.0 From 146c04c054b2b892eb3888134ee526baa545ab4a Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Tue, 30 Jul 2024 23:03:10 +0200 Subject: [PATCH 8/8] ff --- host_vars/docker10.mgrote.net.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/host_vars/docker10.mgrote.net.yml b/host_vars/docker10.mgrote.net.yml index 92486d2f..a614829e 100644 --- a/host_vars/docker10.mgrote.net.yml +++ b/host_vars/docker10.mgrote.net.yml @@ -59,8 +59,6 @@ compose_files: - name: postfix state: present network: postfix - - name: mail-relay - state: absent - name: woodpecker state: present network: traefik -- 2.43.0