mirror of
https://github.com/Mailu/Mailu.git
synced 2024-12-14 10:53:30 +02:00
Switch to the new networking API
This commit is contained in:
parent
18af763293
commit
719afcf0dd
@ -9,9 +9,6 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
links:
|
|
||||||
- admin:admin
|
|
||||||
- webmail:webmail
|
|
||||||
volumes:
|
volumes:
|
||||||
- /data/certs:/certs
|
- /data/certs:/certs
|
||||||
|
|
||||||
@ -35,9 +32,6 @@ services:
|
|||||||
- "25:25"
|
- "25:25"
|
||||||
- "465:465"
|
- "465:465"
|
||||||
- "587:587"
|
- "587:587"
|
||||||
links:
|
|
||||||
- filter:lmtp
|
|
||||||
- imap:sasl
|
|
||||||
volumes:
|
volumes:
|
||||||
- /data/freeposte:/data
|
- /data/freeposte:/data
|
||||||
- /data/logs:/logs
|
- /data/logs:/logs
|
||||||
@ -47,8 +41,6 @@ services:
|
|||||||
build: amavis
|
build: amavis
|
||||||
image: freeposte/amavis
|
image: freeposte/amavis
|
||||||
env_file: freeposte.env
|
env_file: freeposte.env
|
||||||
links:
|
|
||||||
- imap:lmtp
|
|
||||||
volumes:
|
volumes:
|
||||||
- /data/filter:/data
|
- /data/filter:/data
|
||||||
|
|
||||||
@ -63,8 +55,5 @@ services:
|
|||||||
build: roundcube
|
build: roundcube
|
||||||
image: freeposte/roundcube
|
image: freeposte/roundcube
|
||||||
env_file: freeposte.env
|
env_file: freeposte.env
|
||||||
links:
|
|
||||||
- imap:imap
|
|
||||||
- smtp:smtp
|
|
||||||
volumes:
|
volumes:
|
||||||
- /data/webmail:/data
|
- /data/webmail:/data
|
||||||
|
@ -6,6 +6,7 @@ protocols = imap lmtp sieve
|
|||||||
postmaster_address = %{env:POSTMASTER}@%{env:DOMAIN}
|
postmaster_address = %{env:POSTMASTER}@%{env:DOMAIN}
|
||||||
hostname = %{env:HOSTNAME}
|
hostname = %{env:HOSTNAME}
|
||||||
mail_plugins = $mail_plugins quota
|
mail_plugins = $mail_plugins quota
|
||||||
|
submission_host = smtp
|
||||||
|
|
||||||
service dict {
|
service dict {
|
||||||
unix_listener dict {
|
unix_listener dict {
|
||||||
|
@ -21,4 +21,4 @@ POSTMASTER=admin
|
|||||||
|
|
||||||
# Networks granted relay permissions, make sure that you include your Docker
|
# Networks granted relay permissions, make sure that you include your Docker
|
||||||
# internal network (default to 172.17.0.0/16)
|
# internal network (default to 172.17.0.0/16)
|
||||||
RELAYNETS=172.17.0.0/16
|
RELAYNETS=172.16.0.0/12
|
||||||
|
@ -33,11 +33,15 @@ http {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://webmail;
|
resolver 127.0.0.11;
|
||||||
|
set $webmail_backend "http://webmail";
|
||||||
|
proxy_pass $webmail_backend;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /admin {
|
location /admin {
|
||||||
proxy_pass http://admin;
|
resolver 127.0.0.11;
|
||||||
|
set $admin_backend "http://admin";
|
||||||
|
proxy_pass $admin_backend;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,7 @@ smtp_tls_security_level = may
|
|||||||
###############
|
###############
|
||||||
smtpd_sasl_local_domain = $myhostname
|
smtpd_sasl_local_domain = $myhostname
|
||||||
smtpd_sasl_type = dovecot
|
smtpd_sasl_type = dovecot
|
||||||
smtpd_sasl_path = inet:sasl:2102
|
smtpd_sasl_path = inet:imap:2102
|
||||||
smtpd_sasl_auth_enable = yes
|
smtpd_sasl_auth_enable = yes
|
||||||
smtpd_sasl_security_options = noanonymous
|
smtpd_sasl_security_options = noanonymous
|
||||||
|
|
||||||
@ -39,5 +39,5 @@ smtpd_sasl_security_options = noanonymous
|
|||||||
###############
|
###############
|
||||||
virtual_mailbox_domains = ${sql}sqlite-virtual_mailbox_domains.cf
|
virtual_mailbox_domains = ${sql}sqlite-virtual_mailbox_domains.cf
|
||||||
virtual_alias_maps = ${sql}sqlite-virtual_alias_maps.cf
|
virtual_alias_maps = ${sql}sqlite-virtual_alias_maps.cf
|
||||||
virtual_transport = lmtp:inet:lmtp:2525
|
virtual_transport = lmtp:inet:filter:2525
|
||||||
lmtp_host_lookup = native
|
lmtp_host_lookup = native
|
||||||
|
Loading…
Reference in New Issue
Block a user