Shuffle env vars for simplicity

This commit is contained in:
decentral1se 2021-05-14 15:46:35 +02:00
parent f3c1733d2f
commit 3837c6cb55
Signed by: decentral1se
GPG Key ID: 92DAD76BD9567B8A
3 changed files with 9 additions and 13 deletions

View File

@ -5,21 +5,17 @@ LETS_ENCRYPT_ENV=production
SERVE_FROM_DOMAIN=${DOMAIN}
MTA=postfix
CORE_SMTP_HOST=mail_example_com_smtp # mailu smtp
CORE_SMTP_PORT=25
MAILMAN_ADMIN_EMAIL=admin@example.com
SMTP_HOST=mail_example_com_smtp # mailu smtp
SMTP_PORT=25
# Keycloak SSO
# KEYCLOAK_SSO_ENABLED=1
# KEYCLOAK_DOMAIN=login.example.com
# KEYCLOAK_REALM=sso-queens-united
SECRET_DB_PASSWORD_VERSION=v1
SECRET_DJANGO_SECRET_KEY_VERSION=v1
SECRET_HYPERKITTY_API_KEY_VERSION=v1
SECRET_MAILMAN_REST_PASSWORD_VERSION=v1
# Keycloak SSO
# KEYCLOAK_SSO_ENABLED=1
# KEYCLOAK_DOMAIN=login.example.com
# KEYCLOAK_REALM=sso-queens-united

View File

@ -4,7 +4,7 @@ A mailing list management system.
> https://docs.mailman3.org
This configuration is intended to be used with [mailu](https://git.autonomic.zone/coop-cloud/mailu).
This configuration is intended to be used with [mailu](https://git.autonomic.zone/coop-cloud/mailu), assumes the use of a postfix MTA and requires that you share networks and volumes between your Mailu stack and your Mailman3 stack. After installation, you need to run `manage.py createsuperuser` against your `mailman-web` container to create an admin account.
<!-- metadata -->

View File

@ -14,8 +14,6 @@ services:
- hyperkitty_api_key
- mailman_rest_password
environment:
- CORE_SMTP_HOST
- CORE_SMTP_PORT
- DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase
- DATABASE_DB=mailman
- DATABASE_HOST=db
@ -27,7 +25,9 @@ services:
- MAILMAN_HOSTNAME=mailman-core
- MAILMAN_REST_PASSWORD_FILE=/run/secrets/mailman_rest_password
- MAILMAN_REST_USER=restadmin
- MTA
- MTA=postfix
- SMTP_HOST
- SMTP_PORT
configs:
- source: core_entrypoint_sh
target: /usr/local/bin/docker-entrypoint-custom.sh