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

Fix spooky networking issues 🧙

Browse Source
This commit is contained in:
3wc 2023-10-02 22:26:21 +01:00
parent 3702f51514
commit 5d24e8b688
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
abra.sh
View File

@ -1,4 +1,4 @@
export CORE_ENTRYPOINT_CONF_VERSION=v1 export CORE_ENTRYPOINT_CONF_VERSION=v4
export MAILMAN_EXTRA_CFG_VERSION=v1 export MAILMAN_EXTRA_CFG_VERSION=v1
export NGINX_CONF_VERSION=v1 export NGINX_CONF_VERSION=v1
export SETTINGS_LOCAL_VERSION=v2 export SETTINGS_LOCAL_VERSION=v2

7
compose.yml
View File

@ -16,9 +16,10 @@ services:
- hyperkitty_api_key - hyperkitty_api_key
- mailman_rest_password - mailman_rest_password
environment: environment:
- MM_HOSTNAME=core.${SMTP_NETWORK}
- DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase
- DATABASE_DB=mailman - DATABASE_DB=mailman
- DATABASE_HOST=db - DATABASE_HOST=${STACK_NAME}_db
- DATABASE_NAME=mailman - DATABASE_NAME=mailman
- DATABASE_PASSWORD_FILE=/run/secrets/db_password - DATABASE_PASSWORD_FILE=/run/secrets/db_password
- DATABASE_TYPE=postgres - DATABASE_TYPE=postgres
@ -38,6 +39,8 @@ services:
mode: 0555 mode: 0555
entrypoint: /usr/local/bin/docker-entrypoint-custom.sh entrypoint: /usr/local/bin/docker-entrypoint-custom.sh
command: master --force command: master --force
deploy:
endpoint_mode: dnsrr
web: web:
image: "maxking/mailman-web:0.3" image: "maxking/mailman-web:0.3"
@ -53,7 +56,7 @@ services:
- hyperkitty_api_key - hyperkitty_api_key
- mailman_rest_password - mailman_rest_password
environment: environment:
- DATABASE_HOST=db - DATABASE_HOST=${STACK_NAME}_db
- DATABASE_NAME=mailman - DATABASE_NAME=mailman
- DATABASE_PASSWORD_FILE=/run/secrets/db_password - DATABASE_PASSWORD_FILE=/run/secrets/db_password
- DATABASE_TYPE=postgres - DATABASE_TYPE=postgres

2
entrypoint.core.sh.tmpl
View File

@ -161,7 +161,7 @@ cat >> /etc/mailman.cfg << EOF
sleep_time: 10s sleep_time: 10s
[webservice] [webservice]
hostname: $MM_HOSTNAME hostname: 0.0.0.0
port: $MAILMAN_REST_PORT port: $MAILMAN_REST_PORT
admin_user: $MAILMAN_REST_USER admin_user: $MAILMAN_REST_USER
admin_pass: $MAILMAN_REST_PASSWORD admin_pass: $MAILMAN_REST_PASSWORD