diff --git a/web/README.md b/web/README.md index 809fc06..6433760 100644 --- a/web/README.md +++ b/web/README.md @@ -35,8 +35,8 @@ change them unless you know what you want. - `MAILMAN_REST_PASSWORD`: Mailman's REST API user's password. Default value is `restpass` -- `DJANGO_HOST_IP`: IP of the container from which the django will be - served. Default value is `172.19.199.3`. +- `MAILMAN_HOST_IP`: IP of the Container from which Mailman will send emails to + hyperkitty (django). Set to `172.19.199.2` by default. - `SMTP_HOST`: IP Address/hostname from which you will be sending emails. Default value is `172.19.199.1`, which is the address of the Host OS. diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index 90f493a..cf67613 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -59,7 +59,7 @@ MAILMAN_REST_API_URL = os.environ.get('MAILMAN_REST_URL', 'http://mailman-core:8 MAILMAN_REST_API_USER = os.environ.get('MAILMAN_REST_USER', 'restadmin') MAILMAN_REST_API_PASS = os.environ.get('MAILMAN_REST_PASSWORD', 'restpass') MAILMAN_ARCHIVER_KEY = os.environ.get('HYPERKITTY_API_KEY') -MAILMAN_ARCHIVER_FROM = ('mailman-web', os.environ.get('DJANGO_HOST_IP', '172.19.199.3')) +MAILMAN_ARCHIVER_FROM = ('mailman-core', os.environ.get('MAILMAN_HOST_IP', '172.19.199.2')) # Application definition