From 1fc0716564c870c52c861a7700eda3d03c862f81 Mon Sep 17 00:00:00 2001 From: mmurphy <52948395+mm534@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:59:28 +1100 Subject: [PATCH] prevent mailman-web dns lookup from throwing (#681) --- web/mailman-web/settings.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index d5c5df9..7ab51ed 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -29,7 +29,7 @@ https://docs.djangoproject.com/en/1.8/ref/settings/ import os import dj_database_url import sys -from socket import gethostbyname +from socket import gethostbyname, gaierror BASE_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -50,9 +50,14 @@ SITE_ID = 1 ALLOWED_HOSTS = [ "localhost", # Archiving API from Mailman, keep it. "mailman-web", - gethostbyname("mailman-web"), os.environ.get('SERVE_FROM_DOMAIN'), ] + +try: + ALLOWED_HOSTS.append(gethostbyname("mailman-web")) # only add if this resolves +except gaierror: + pass + ALLOWED_HOSTS.extend(os.getenv("DJANGO_ALLOWED_HOSTS", "").split(",")) # Mailman API credentials