diff --git a/.env.sample b/.env.sample index 7dc69ba..f35b752 100644 --- a/.env.sample +++ b/.env.sample @@ -26,3 +26,6 @@ SECRET_MAILMAN_REST_PASSWORD_VERSION=v1 # KEYCLOAK_SSO_ENABLED=1 # KEYCLOAK_DOMAIN=login.example.com # KEYCLOAK_REALM=sso-queens-united + +# DEV_MODE_ENABLED=1 +# DEV_MODE_EMAIL=email@example.com diff --git a/abra.sh b/abra.sh index f45762e..44b93ed 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export CORE_ENTRYPOINT_CONF_VERSION=v4 +export CORE_ENTRYPOINT_CONF_VERSION=v5 export MAILMAN_EXTRA_CFG_VERSION=v1 export NGINX_CONF_VERSION=v1 export SETTINGS_LOCAL_VERSION=v2 diff --git a/compose.yml b/compose.yml index 044a2f4..3f8ceca 100644 --- a/compose.yml +++ b/compose.yml @@ -31,6 +31,8 @@ services: - MTA=postfix - SMTP_HOST - SMTP_PORT + - DEV_MODE_ENABLED + - DEV_MODE_EMAIL configs: - source: mailman_extra_cfg target: /opt/mailman/core/mailman-extra.cfg diff --git a/entrypoint.core.sh.tmpl b/entrypoint.core.sh.tmpl old mode 100644 new mode 100755 index 614b216..6295017 --- a/entrypoint.core.sh.tmpl +++ b/entrypoint.core.sh.tmpl @@ -234,6 +234,15 @@ then cat /opt/mailman/gunicorn-extra.cfg > /etc/gunicorn.cfg fi +if [ $DEV_MODE_ENABLED == "1" ]; then + cat >> /etc/mailman.cfg <<__EOF +[devmode] +enabled: yes +recipient: $DEV_MODE_EMAIL + +__EOF +fi + if [[ -v HYPERKITTY_API_KEY ]]; then echo "HYPERKITTY_API_KEY found, setting up HyperKitty archiver..."