rename mail-relay to postfix (#150)
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:
parent
4e8b579f3b
commit
d021a258ae
7 changed files with 18 additions and 16 deletions
|
@ -6,12 +6,13 @@ services:
|
|||
restart: always
|
||||
environment:
|
||||
MAILCONTACT: michael.grote@posteo.de
|
||||
MAILSERVER: mail-relay
|
||||
MAILSERVER: postfix
|
||||
MAILPORT: 25
|
||||
MAILFROM: munin@mgrote.net
|
||||
MAILUSER: munin@mgrote.net
|
||||
MAILNAME: Munin
|
||||
MAILDOMAIN: mgrote.net
|
||||
MAILPASSWORD: ""
|
||||
TZ: Europe/Berlin
|
||||
CRONDELAY: 5
|
||||
NODES: |
|
||||
|
@ -39,5 +40,5 @@ volumes:
|
|||
cache:
|
||||
|
||||
networks:
|
||||
mail-relay:
|
||||
postfix:
|
||||
external: true
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -23,10 +23,10 @@ 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="mail-relay"y
|
||||
php occ config:system:set mail_smtphost --value="postfix"
|
||||
php occ config:system:set mail_smtpport --value="25"
|
||||
|
||||
# status
|
||||
|
|
|
@ -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
|
||||
|
@ -20,12 +20,13 @@ 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:
|
||||
- mail-relay
|
||||
- postfix
|
||||
|
||||
######## Networks ########
|
||||
networks:
|
||||
mail-relay:
|
||||
postfix:
|
||||
external: true
|
|
@ -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
|
||||
|
|
|
@ -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 <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__SMTP_ENCRYPTION: NONE
|
||||
LLDAP_SMTP_OPTIONS__USER: info@mgrote.net
|
||||
|
@ -69,5 +69,5 @@ networks:
|
|||
intern:
|
||||
traefik:
|
||||
external: true
|
||||
mail-relay:
|
||||
postfix:
|
||||
external: true
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue