Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Do not try to get the Core's IP automatically

Browse Source 
Without a try-except block, trying to get the IP of `mailman-core` fails when mailman-web is made to run standalone.
This commit is contained in:
Abhilash Raj
2018-03-15 15:25:05 -07:00
parent 5a8e7f02fc
commit 186bdcef8a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/mailman-web/settings.py
View File

@@ -27,7 +27,6 @@ https://docs.djangoproject.com/en/1.8/ref/settings/
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os import os
import socket
import dj_database_url import dj_database_url
import sys import sys
@@ -57,15 +56,12 @@ ALLOWED_HOSTS = [
os.environ.get('DJANGO_ALLOWED_HOSTS'), os.environ.get('DJANGO_ALLOWED_HOSTS'),
] ]
# Try to get the address of Mailman Core automatically.
MAILMAN_HOST_IP_AUTO = socket.gethostbyname('mailman-core')
# Mailman API credentials # Mailman API credentials
MAILMAN_REST_API_URL = os.environ.get('MAILMAN_REST_URL', 'http://mailman-core:8001') MAILMAN_REST_API_URL = os.environ.get('MAILMAN_REST_URL', 'http://mailman-core:8001')
MAILMAN_REST_API_USER = os.environ.get('MAILMAN_REST_USER', 'restadmin') MAILMAN_REST_API_USER = os.environ.get('MAILMAN_REST_USER', 'restadmin')
MAILMAN_REST_API_PASS = os.environ.get('MAILMAN_REST_PASSWORD', 'restpass') MAILMAN_REST_API_PASS = os.environ.get('MAILMAN_REST_PASSWORD', 'restpass')
MAILMAN_ARCHIVER_KEY = os.environ.get('HYPERKITTY_API_KEY') MAILMAN_ARCHIVER_KEY = os.environ.get('HYPERKITTY_API_KEY')
MAILMAN_ARCHIVER_FROM = (MAILMAN_HOST_IP_AUTO, os.environ.get('MAILMAN_HOST_IP', '172.19.199.2')) MAILMAN_ARCHIVER_FROM = os.environ.get('MAILMAN_HOST_IP', '172.19.199.2')
# Application definition # Application definition