opendev/system-config
Code Issues Proposed changes

Override upstream ADMINS address for mailman

Browse Source 
Deliveries to root@localhost don't work, use the same as the from
address instead.

Change-Id: Id509f652be3b4b6f77edc85161aed7200f672571
This commit is contained in:
Jeremy Stanley 2024-04-24 18:02:00 +00:00
parent a713d1ded5
commit 17276d0d31
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
playbooks/roles/mailman3/files/web-settings.py
View File

@ -2,7 +2,7 @@
# #
# This file has been copied from: # This file has been copied from:
# https://github.com/maxking/docker-mailman/blob/ab8dfb3/web/mailman-web/settings.py # https://github.com/maxking/docker-mailman/blob/ab8dfb3/web/mailman-web/settings.py
# In order to override the ALLOWED_HOSTS and SITE_ID settings. # In order to override the ALLOWED_HOSTS, SITE_ID and ADMINS settings.
# #
# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. # Copyright (C) 1998-2016 by the Free Software Foundation, Inc.
# #
@ -44,9 +44,10 @@ SECRET_KEY = os.environ.get('SECRET_KEY')
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False DEBUG = False
ADMINS = ( # Upstream sets ADMINS here, but we set it later after SERVER_EMAIL is defined.
('Mailman Suite Admin', 'root@localhost'), #ADMINS = (
) # ('Mailman Suite Admin', 'root@localhost'),
#)
# Magic value to perform automatic domain guessing # Magic value to perform automatic domain guessing
SITE_ID = 0 SITE_ID = 0
@ -220,6 +221,11 @@ hostname = os.environ.get('SERVE_FROM_DOMAIN', 'localhost.local')
DEFAULT_FROM_EMAIL = 'postorius@{}'.format(hostname) DEFAULT_FROM_EMAIL = 'postorius@{}'.format(hostname)
SERVER_EMAIL = 'root@{}'.format(hostname) SERVER_EMAIL = 'root@{}'.format(hostname)
# Errors go to these addresses
ADMINS = (
('Mailman Suite Admin', SERVER_EMAIL),
)
# Change this when you have a real email backend # Change this when you have a real email backend
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST = os.environ.get('SMTP_HOST', '') EMAIL_HOST = os.environ.get('SMTP_HOST', '')