rename mail-relay to postfix (#150)
Some checks failed
ci/woodpecker/push/gitleaks Pipeline was successful
ci/woodpecker/push/ansible-lint Pipeline failed

Reviewed-on: #150
Co-authored-by: Michael Grote <michael.grote@posteo.de>
Co-committed-by: Michael Grote <michael.grote@posteo.de>
This commit is contained in:
Michael Grote 2024-07-30 23:05:24 +02:00 committed by Michael Grote
parent 4e8b579f3b
commit d021a258ae
7 changed files with 18 additions and 16 deletions

View file

@ -6,12 +6,13 @@ services:
restart: always restart: always
environment: environment:
MAILCONTACT: michael.grote@posteo.de MAILCONTACT: michael.grote@posteo.de
MAILSERVER: mail-relay MAILSERVER: postfix
MAILPORT: 25 MAILPORT: 25
MAILFROM: munin@mgrote.net MAILFROM: munin@mgrote.net
MAILUSER: munin@mgrote.net MAILUSER: munin@mgrote.net
MAILNAME: Munin MAILNAME: Munin
MAILDOMAIN: mgrote.net MAILDOMAIN: mgrote.net
MAILPASSWORD: ""
TZ: Europe/Berlin TZ: Europe/Berlin
CRONDELAY: 5 CRONDELAY: 5
NODES: | NODES: |
@ -39,5 +40,5 @@ volumes:
cache: cache:
networks: networks:
mail-relay: postfix:
external: true external: true

View file

@ -107,7 +107,7 @@ services:
networks: networks:
- intern - intern
- traefik - traefik
- mail-relay - postfix
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "--insecure", "http://localhost:80"] test: ["CMD", "curl", "-f", "--insecure", "http://localhost:80"]
interval: 30s interval: 30s
@ -137,7 +137,7 @@ networks:
driver: bridge driver: bridge
traefik: traefik:
external: true external: true
mail-relay: postfix:
external: true external: true
######## Volumes ######## ######## Volumes ########
volumes: volumes:

View file

@ -23,10 +23,10 @@ php occ background:cron
php occ config:system:set logtimezone --value="Europe/Berlin" php occ config:system:set logtimezone --value="Europe/Berlin"
# mail # 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_smtpmode --value="smtp"
php occ config:system:set mail_sendmailmode --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" php occ config:system:set mail_smtpport --value="25"
# status # status

View file

@ -2,7 +2,7 @@ version: '3.3'
services: services:
postfix: postfix:
image: "registry.mgrote.net/postfix:latest" image: "registry.mgrote.net/postfix:latest"
container_name: mail-relay container_name: postfix
restart: always restart: always
ports: ports:
- 1025:25 - 1025:25
@ -20,12 +20,13 @@ services:
/mg@pbs.localdomain/ pbs@mgrote.net /mg@pbs.localdomain/ pbs@mgrote.net
/root@pbs.localdomain/ pbs@mgrote.net /root@pbs.localdomain/ pbs@mgrote.net
/root@pve5.localdomain/ pve5@mgrote.net /root@pve5.localdomain/ pve5@mgrote.net
/no-reply@ubnt.com/ ubiquity@mgrote.net
# rewrite FROM "nobody@lldap" to "lldap@mgrote.net" # rewrite FROM "nobody@lldap" to "lldap@mgrote.net"
# /.*/ würde alle absender adressen ersetzen # /.*/ würde alle absender adressen ersetzen
networks: networks:
- mail-relay - postfix
######## Networks ######## ######## Networks ########
networks: networks:
mail-relay: postfix:
external: true external: true

View file

@ -29,7 +29,7 @@ services:
- 5514:5514/udp #optional - 5514:5514/udp #optional
restart: always restart: always
networks: networks:
- mail-relay - postfix
- unifi-internal - unifi-internal
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "--insecure", "https://localhost:8443"] test: ["CMD", "curl", "-f", "--insecure", "https://localhost:8443"]
@ -66,7 +66,7 @@ volumes:
unifi-data: unifi-data:
######## Networks ######## ######## Networks ########
networks: networks:
mail-relay: postfix:
external: true external: true
unifi-internal: unifi-internal:
driver: bridge driver: bridge

View file

@ -13,7 +13,7 @@ services:
networks: networks:
- intern - intern
- traefik - traefik
- mail-relay - postfix
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
@ -33,7 +33,7 @@ services:
LLDAP_SMTP_OPTIONS__ENABLE_PASSWORD_reset: true LLDAP_SMTP_OPTIONS__ENABLE_PASSWORD_reset: true
LLDAP_SMTP_OPTIONS__FROM: "LLDAP Admin <info@mgrote.net>" LLDAP_SMTP_OPTIONS__FROM: "LLDAP Admin <info@mgrote.net>"
LLDAP_SMTP_OPTIONS__REPLY_TO: "Do not reply <info@mgrote.net>" LLDAP_SMTP_OPTIONS__REPLY_TO: "Do not reply <info@mgrote.net>"
LLDAP_SMTP_OPTIONS__SERVER: mail-relay LLDAP_SMTP_OPTIONS__SERVER: postfix
LLDAP_SMTP_OPTIONS__PORT: 25 LLDAP_SMTP_OPTIONS__PORT: 25
LLDAP_SMTP_OPTIONS__SMTP_ENCRYPTION: NONE LLDAP_SMTP_OPTIONS__SMTP_ENCRYPTION: NONE
LLDAP_SMTP_OPTIONS__USER: info@mgrote.net LLDAP_SMTP_OPTIONS__USER: info@mgrote.net
@ -69,5 +69,5 @@ networks:
intern: intern:
traefik: traefik:
external: true external: true
mail-relay: postfix:
external: true external: true

View file

@ -56,9 +56,9 @@ compose_files:
network: traefik network: traefik
- name: routeros-config-export - name: routeros-config-export
state: present state: present
- name: mail-relay - name: postfix
state: present state: present
network: mail-relay network: postfix
- name: woodpecker - name: woodpecker
state: present state: present
network: traefik network: traefik