Compare commits
5 Commits
arc-dkim
...
fetchmail-
Author | SHA1 | Date | |
---|---|---|---|
3a8bf5519e | |||
976b85b701 | |||
2cd5446ca2 | |||
16bd66c208 | |||
68fd4e6a1b |
@ -85,6 +85,8 @@ RELAYHOST=
|
|||||||
|
|
||||||
# Enable fetchmail
|
# Enable fetchmail
|
||||||
FETCHMAIL_ENABLED=False
|
FETCHMAIL_ENABLED=False
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.fetchmail.yml"
|
||||||
|
#FETCHMAIL_ENABLED=True
|
||||||
|
|
||||||
# Fetchmail delay
|
# Fetchmail delay
|
||||||
FETCHMAIL_DELAY=600
|
FETCHMAIL_DELAY=600
|
||||||
@ -116,7 +118,7 @@ COMPRESSION_LEVEL=
|
|||||||
|
|
||||||
# Mailman settings
|
# Mailman settings
|
||||||
# NOTE(3wc): remember to also set RELAYNETS
|
# NOTE(3wc): remember to also set RELAYNETS
|
||||||
#COMPOSE_FILE="compose.yml:compose.mailman.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.mailman.yml"
|
||||||
#MAILMAN_POSTFIX_OVERRIDES=1
|
#MAILMAN_POSTFIX_OVERRIDES=1
|
||||||
#MAILMAN_CORE_VOLUME=lists_example_com_mailman-core
|
#MAILMAN_CORE_VOLUME=lists_example_com_mailman-core
|
||||||
#MAILMAN_CORE_NETWORK=lists_example_com_internal
|
#MAILMAN_CORE_NETWORK=lists_example_com_internal
|
||||||
@ -126,7 +128,7 @@ COMPRESSION_LEVEL=
|
|||||||
# return-path: https://www.rubydoc.info/gems/actionmailer-rack-upgrade-2/2.3.15/ActionMailer/Base
|
# return-path: https://www.rubydoc.info/gems/actionmailer-rack-upgrade-2/2.3.15/ActionMailer/Base
|
||||||
# logins and MAIL FROM ownership: http://www.postfix.com/postconf.5.html#smtpd_relay_restrictions
|
# logins and MAIL FROM ownership: http://www.postfix.com/postconf.5.html#smtpd_relay_restrictions
|
||||||
# there is an open ticket with a further discussion also https://github.com/Mailu/Mailu/issues/1096
|
# there is an open ticket with a further discussion also https://github.com/Mailu/Mailu/issues/1096
|
||||||
#COMPOSE_FILE="compose.yml:compose.senderlogins.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.senderlogins.yml"
|
||||||
#SENDER_LOGINS_POSTFIX_OVERRIDES=1
|
#SENDER_LOGINS_POSTFIX_OVERRIDES=1
|
||||||
|
|
||||||
SECRET_SECRET_KEY_VERSION=v1
|
SECRET_SECRET_KEY_VERSION=v1
|
||||||
|
@ -27,7 +27,7 @@ host.
|
|||||||
5. `abra app deploy YOURAPPDOMAIN`
|
5. `abra app deploy YOURAPPDOMAIN`
|
||||||
9. Create initial user:
|
9. Create initial user:
|
||||||
```
|
```
|
||||||
abra app YOURAPPDOMAIN run admin flask mailu admin admin YOURDOMAIN YOURPASSWORD
|
abra app run YOURDOMAIN admin flask mailu admin admin YOURDOMAIN YOURPASSWORD
|
||||||
```
|
```
|
||||||
|
|
||||||
[Mailu]: https://mailu.io/
|
[Mailu]: https://mailu.io/
|
||||||
|
4
abra.sh
4
abra.sh
@ -1,5 +1,3 @@
|
|||||||
export CERTDUMPER_POST_VERSION=v1
|
export CERTDUMPER_POST_VERSION=v1
|
||||||
export POSTFIX_OVERRIDE_VERSION=v15
|
export POSTFIX_OVERRIDE_VERSION=v17
|
||||||
export SENDER_LOGIN_VERSIONS=v2
|
export SENDER_LOGIN_VERSIONS=v2
|
||||||
export ARC_OVERRIDE_VERSION=v8
|
|
||||||
export DKIM_IP_MAP_OVERRIDE_VERSION=v2
|
|
||||||
|
14
compose.fetchmail.yml
Normal file
14
compose.fetchmail.yml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
|
||||||
|
services:
|
||||||
|
fetchmail:
|
||||||
|
image: ghcr.io/mailu/fetchmail:2.0.34
|
||||||
|
environment: *default-env
|
||||||
|
volumes:
|
||||||
|
- "fetchmail:/data"
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
networks:
|
||||||
|
- default
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
fetchmail:
|
@ -10,42 +10,20 @@ services:
|
|||||||
- MAILMAN_POSTFIX_OVERRIDES
|
- MAILMAN_POSTFIX_OVERRIDES
|
||||||
networks:
|
networks:
|
||||||
- default
|
- default
|
||||||
- shared_mailman_network
|
|
||||||
volumes:
|
volumes:
|
||||||
- "shared-mailman-core:/opt/mailman/"
|
- "shared-mailman-core:/opt/mailman/"
|
||||||
configs:
|
configs:
|
||||||
- source: postfix_override
|
- source: postfix_override
|
||||||
target: /overrides/postfix.cf
|
target: /overrides/postfix.cf
|
||||||
antispam:
|
|
||||||
configs:
|
|
||||||
- source: arc_conf_override
|
|
||||||
target: /overrides/arc.conf
|
|
||||||
- source: dkim_ip_map_override
|
|
||||||
target: /overrides/dkim_ip.map
|
|
||||||
volumes:
|
|
||||||
- "rspam_overrides:/etc/rspamd/override.d"
|
|
||||||
|
|
||||||
networks:
|
|
||||||
shared_mailman_network:
|
|
||||||
external: true
|
|
||||||
name: ${MAILMAN_CORE_NETWORK}
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
# https://git.autonomic.zone/coop-cloud/mailman3/src/branch/master/compose.yml
|
# https://git.autonomic.zone/coop-cloud/mailman3/src/branch/master/compose.yml
|
||||||
shared-mailman-core:
|
shared-mailman-core:
|
||||||
external: true
|
external: true
|
||||||
name: ${MAILMAN_CORE_VOLUME}
|
name: ${MAILMAN_CORE_VOLUME}
|
||||||
rspam_overrides:
|
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
postfix_override:
|
postfix_override:
|
||||||
name: ${STACK_NAME}_postfix_overrides_${POSTFIX_OVERRIDE_VERSION}
|
name: ${STACK_NAME}_postfix_overrides_${POSTFIX_OVERRIDE_VERSION}
|
||||||
file: mailman-postfix.cf.tmpl
|
file: postfix.cf.tmpl
|
||||||
template_driver: golang
|
|
||||||
arc_conf_override:
|
|
||||||
name: ${STACK_NAME}_arc_conf_override_${ARC_OVERRIDE_VERSION}
|
|
||||||
file: mailman-arc.conf
|
|
||||||
dkim_ip_map_override:
|
|
||||||
name: ${STACK_NAME}_dkim_ip_map_${DKIM_IP_MAP_OVERRIDE_VERSION}
|
|
||||||
file: mailman-dkim_ip.map.tmpl
|
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
17
compose.yml
17
compose.yml
@ -18,6 +18,7 @@ x-environment:
|
|||||||
- DMARC_RUF
|
- DMARC_RUF
|
||||||
- DOCKER_CONTEXT
|
- DOCKER_CONTEXT
|
||||||
- DOMAIN
|
- DOMAIN
|
||||||
|
- FETCHMAIL_ENABLED
|
||||||
- FETCHMAIL_DELAY
|
- FETCHMAIL_DELAY
|
||||||
- FULL_TEXT_SEARCH
|
- FULL_TEXT_SEARCH
|
||||||
- HOSTNAMES
|
- HOSTNAMES
|
||||||
@ -54,7 +55,7 @@ x-environment:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: ghcr.io/mailu/nginx:2.0.23
|
image: ghcr.io/mailu/nginx:2.0.34
|
||||||
logging:
|
logging:
|
||||||
driver: json-file
|
driver: json-file
|
||||||
networks:
|
networks:
|
||||||
@ -95,15 +96,15 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
- "coop-cloud.${STACK_NAME}.version=1.0.2+2.0.23"
|
- "coop-cloud.${STACK_NAME}.version=1.1.0+2.0.34"
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: redis:7.2.0-alpine
|
image: redis:7.2.3-alpine
|
||||||
volumes:
|
volumes:
|
||||||
- "redis:/data"
|
- "redis:/data"
|
||||||
|
|
||||||
admin:
|
admin:
|
||||||
image: ghcr.io/mailu/admin:2.0.23
|
image: ghcr.io/mailu/admin:2.0.34
|
||||||
environment: *default-env
|
environment: *default-env
|
||||||
healthcheck:
|
healthcheck:
|
||||||
disable: true
|
disable: true
|
||||||
@ -116,7 +117,7 @@ services:
|
|||||||
- default
|
- default
|
||||||
|
|
||||||
imap:
|
imap:
|
||||||
image: ghcr.io/mailu/dovecot:2.0.23
|
image: ghcr.io/mailu/dovecot:2.0.34
|
||||||
environment: *default-env
|
environment: *default-env
|
||||||
secrets:
|
secrets:
|
||||||
- secret_key
|
- secret_key
|
||||||
@ -130,7 +131,7 @@ services:
|
|||||||
- default
|
- default
|
||||||
|
|
||||||
smtp:
|
smtp:
|
||||||
image: ghcr.io/mailu/postfix:2.0.23
|
image: ghcr.io/mailu/postfix:2.0.34
|
||||||
environment: *default-env
|
environment: *default-env
|
||||||
secrets:
|
secrets:
|
||||||
- secret_key
|
- secret_key
|
||||||
@ -142,7 +143,7 @@ services:
|
|||||||
- app
|
- app
|
||||||
|
|
||||||
antispam:
|
antispam:
|
||||||
image: ghcr.io/mailu/rspamd:2.0.23
|
image: ghcr.io/mailu/rspamd:2.0.34
|
||||||
environment: *default-env
|
environment: *default-env
|
||||||
secrets:
|
secrets:
|
||||||
- secret_key
|
- secret_key
|
||||||
@ -153,7 +154,7 @@ services:
|
|||||||
disable: true
|
disable: true
|
||||||
|
|
||||||
webmail:
|
webmail:
|
||||||
image: ghcr.io/mailu/webmail:2.0.23
|
image: ghcr.io/mailu/webmail:2.0.34
|
||||||
environment: *default-env
|
environment: *default-env
|
||||||
networks:
|
networks:
|
||||||
- default
|
- default
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
type=console
|
|
||||||
debug_modules=dkim
|
|
@ -1,7 +0,0 @@
|
|||||||
sign_networks = "/overrides/dkim_ip.map";
|
|
||||||
path = "/dkim/$domain.$selector.key";
|
|
||||||
use_domain = "header";
|
|
||||||
#use_vault = false;
|
|
||||||
#try_fallback = true;
|
|
||||||
#selector_map = "/overrides/dkim_selectors.map";
|
|
||||||
#selector = "dkim";
|
|
@ -1 +0,0 @@
|
|||||||
{{ env "RELAYNETS" }}
|
|
@ -10,9 +10,9 @@
|
|||||||
|
|
||||||
unknown_local_recipient_reject_code = 550
|
unknown_local_recipient_reject_code = 550
|
||||||
owner_request_special = no
|
owner_request_special = no
|
||||||
|
virtual_mailbox_maps = regexp:/opt/mailman/var/data/postfix_lmtp, \${podop}mailbox
|
||||||
transport_maps = regexp:/opt/mailman/var/data/postfix_lmtp \${podop}transport
|
transport_maps = regexp:/opt/mailman/var/data/postfix_lmtp \${podop}transport
|
||||||
local_recipient_maps = regexp:/opt/mailman/var/data/postfix_lmtp
|
local_recipient_maps = regexp:/opt/mailman/var/data/postfix_lmtp
|
||||||
relay_domains = regexp:/opt/mailman/var/data/postfix_domains \${podop}transport
|
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{ if eq (env "SENDER_LOGINS_POSTFIX_OVERRIDES") "1" }}
|
{{ if eq (env "SENDER_LOGINS_POSTFIX_OVERRIDES") "1" }}
|
||||||
# https://github.com/Mailu/Mailu/issues/1096
|
# https://github.com/Mailu/Mailu/issues/1096
|
18
release/1.1.0+2.0.34
Normal file
18
release/1.1.0+2.0.34
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Secret key
|
||||||
|
|
||||||
|
The secret key is now stored as a docker secret instead of a variable in the
|
||||||
|
env file. You need to insert it by running:
|
||||||
|
`abra app secret insert <your mailu app> secret_key v1 <SECRETKEYHERE>`
|
||||||
|
and you can remove `SECRET_KEY` from your config file.
|
||||||
|
|
||||||
|
# `DOMAIN` is now `MAIL_DOMAIN`
|
||||||
|
|
||||||
|
This is important! If your main e-mail domain is something else than the
|
||||||
|
domain you are reaching the web interface at, you need to make changes.
|
||||||
|
I.e. in our setup we have `autonomic.zone` pointing an A record at some server
|
||||||
|
and `mail.autonomic.zone` is a separate server, and MX records are pointing
|
||||||
|
to the server at `mail.autonomic.zone`.
|
||||||
|
In this case:
|
||||||
|
- `DOMAIN` should be `mail.autonomic.zone` - this is what traefik will use to
|
||||||
|
provision a certificate
|
||||||
|
- `MAIL_DOMAIN` should be `autonomic.zone`
|
Reference in New Issue
Block a user