coop-cloud/mailman3
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Further config crunching

Browse Source
This commit is contained in:
decentral1se
2021-05-08 22:29:15 +02:00
parent 5f30544ca7
commit 4fc02387da
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.env.sample
View File

@ -3,18 +3,15 @@ TYPE=mailman3
DOMAIN=lists.example.com DOMAIN=lists.example.com
LETS_ENCRYPT_ENV=production LETS_ENCRYPT_ENV=production
# mailman-core
MTA=postfix MTA=postfix
SMTP_HOST=mail.example.com
SMTP_PORT=25
# mailman-web SERVE_FROM_DOMAIN=${DOMAIN}
DJANGO_ALLOWED_HOSTS=lists.example.com
MAILMAN_ADMIN_EMAIL=helo@example.com MAILMAN_ADMIN_EMAIL=admin@example.com
MAILMAN_ADMIN_USER=autonomic MAILMAN_ADMIN_USER=admin
SERVE_FROM_DOMAIN=lists.example.com
SMTP_HOST=mail.example.com SMTP_HOST=mail.example.com
SMTP_HOST_USER=mailman@lists.example.com SMTP_HOST_USER=lists@lists.example.com
SMTP_PORT=25 SMTP_PORT=25
SMTP_USE_TLS=True SMTP_USE_TLS=True
@ -26,5 +23,5 @@ SMTP_USE_TLS=True
SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_PASSWORD_VERSION=v1
SECRET_DJANGO_SECRET_KEY_VERSION=v1 SECRET_DJANGO_SECRET_KEY_VERSION=v1
SECRET_HYPERKITTY_API_KEY_VERSION=v1 SECRET_HYPERKITTY_API_KEY_VERSION=v1
SECRET_MAILMAIN_REST_PASSWORD_VERSION=v1 SECRET_MAILMAN_REST_PASSWORD_VERSION=v1
SECRET_SMTP_HOST_PASSWORD_VERSION=v1 SECRET_SMTP_HOST_PASSWORD_VERSION=v1

5
compose.yml
View File

@ -58,7 +58,6 @@ services:
environment: environment:
- DATABASE_PASSWORD_FILE=/run/secrets/db_password - DATABASE_PASSWORD_FILE=/run/secrets/db_password
- DATABASE_TYPE=postgres - DATABASE_TYPE=postgres
- DJANGO_ALLOWED_HOSTS
- HYPERKITTY_API_KEY_FILE=/run/secrets/hyperkitty_api_key - HYPERKITTY_API_KEY_FILE=/run/secrets/hyperkitty_api_key
- MAILMAN_ADMIN_EMAIL - MAILMAN_ADMIN_EMAIL
- MAILMAN_ADMIN_USER - MAILMAN_ADMIN_USER
@ -132,7 +131,7 @@ secrets:
name: ${STACK_NAME}_django_secret_key_${SECRET_DJANGO_SECRET_KEY_VERSION} name: ${STACK_NAME}_django_secret_key_${SECRET_DJANGO_SECRET_KEY_VERSION}
mailman_rest_password: mailman_rest_password:
external: true external: true
name: ${STACK_NAME}_mailman_rest_password_${SECRET_MAILMAIN_REST_PASSWORD_VERSION} name: ${STACK_NAME}_mailman_rest_password_${SECRET_MAILMAN_REST_PASSWORD_VERSION}
smtp_host_password: smtp_host_password:
external: true external: true
name: ${STACK_NAME}_smtp_host_password_${SECRET_SMTP_HOST_PASSWORD_VERSION} name: ${STACK_NAME}_smtp_host_password_${SECRET_SMTP_HOST_PASSWORD_VERSION}
@ -154,7 +153,7 @@ configs:
name: ${STACK_NAME}_settings_local_${SETTINGS_LOCAL_VERSION} name: ${STACK_NAME}_settings_local_${SETTINGS_LOCAL_VERSION}
file: settings_local.py.tmpl file: settings_local.py.tmpl
template_driver: golang template_driver: golang
mailmain_extra_cfg: mailman_extra_cfg:
name: ${STACK_NAME}_mailman_extra_cfg_${MAILMAN_EXTRA_CFG_VERSION} name: ${STACK_NAME}_mailman_extra_cfg_${MAILMAN_EXTRA_CFG_VERSION}
file: mailman-extra.cfg.tmpl file: mailman-extra.cfg.tmpl
template_driver: golang template_driver: golang

2
mailman-extra.cfg.tmpl
View File

@ -3,7 +3,7 @@ incoming: mailman.mta.postfix.LMTP
outgoing: mailman.mta.deliver.deliver outgoing: mailman.mta.deliver.deliver
# mailman-core hostname or IP from the Postfix server # mailman-core hostname or IP from the Postfix server
lmtp_host: localhost lmtp_host: {{ env "MAILMAN_HOSTNAME" }}
lmtp_port: 8024 lmtp_port: 8024
# Postfix server's hostname or IP from mailman-core # Postfix server's hostname or IP from mailman-core