From 189aa66d6a49e0b5fd54e62ff5b29ebd24fafb8d Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Thu, 12 Dec 2024 16:36:06 -0800 Subject: [PATCH] fix: remove mailman2 artifacts. Fixes #3855 --- backend/mlarchive/archive/utils.py | 8 ++++---- backend/mlarchive/settings/base.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/mlarchive/archive/utils.py b/backend/mlarchive/archive/utils.py index 739168dd..83eac432 100644 --- a/backend/mlarchive/archive/utils.py +++ b/backend/mlarchive/archive/utils.py @@ -240,10 +240,10 @@ def get_fqdn_map(): if fqdn_map is None: fqdn_map = defaultdict(fqdn_default) client = mailmanclient.Client( - settings.MAILMAN_API_URL, - settings.MAILMAN_API_USER, - settings.MAILMAN_API_PASSWORD, - request_hooks=[add_cloudflare_credentials]) + settings.MAILMAN_API_URL, + settings.MAILMAN_API_USER, + settings.MAILMAN_API_PASSWORD, + request_hooks=[add_cloudflare_credentials]) for mailman_list in client.lists: fqdn_map[mailman_list.list_name] = mailman_list.mail_host cache.set('fqdn_map', fqdn_map, timeout=86400) diff --git a/backend/mlarchive/settings/base.py b/backend/mlarchive/settings/base.py index f6f5b10b..46526688 100644 --- a/backend/mlarchive/settings/base.py +++ b/backend/mlarchive/settings/base.py @@ -282,7 +282,6 @@ LOG_FILE = os.path.join(LOG_DIR, 'mlarchive.log') # MAILMAN SETTINGS -MAILMAN_DIR = '/usr/lib/mailman' MAILMAN_API_URL = env('MAILMAN_API_URL') MAILMAN_API_USER = env('MAILMAN_API_USER') MAILMAN_API_PASSWORD = env('MAILMAN_API_PASSWORD')