From 38b52edd90179ecf511a0638cc18c43fc0b68afe Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Thu, 9 Jan 2025 14:33:34 +0100
Subject: [PATCH] Configurable e-mail sender address
---
arkindex/project/config.py | 1 +
arkindex/project/settings.py | 2 +-
arkindex/project/tests/config_samples/override.yaml | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arkindex/project/config.py b/arkindex/project/config.py
index edcb4e3a4f..b97f561fc4 100644
--- a/arkindex/project/config.py
+++ b/arkindex/project/config.py
@@ -112,6 +112,7 @@ def get_settings_parser(base_dir):
email_parser.add_option("port", type=int)
email_parser.add_option("user", type=str)
email_parser.add_option("password", type=str)
+ email_parser.add_option("from_address", type=str, default=None)
email_parser.add_option("error_report_recipients", type=str, many=True, default=[])
export_parser = parser.add_subparser("export", default={})
diff --git a/arkindex/project/settings.py b/arkindex/project/settings.py
index d3173a6245..e7daebda12 100644
--- a/arkindex/project/settings.py
+++ b/arkindex/project/settings.py
@@ -480,7 +480,7 @@ if conf["email"]:
EMAIL_HOST = conf["email"]["host"]
EMAIL_PORT = conf["email"]["port"]
EMAIL_HOST_USER = conf["email"]["user"]
- DEFAULT_FROM_EMAIL = SERVER_EMAIL = EMAIL_HOST_USER
+ DEFAULT_FROM_EMAIL = SERVER_EMAIL = conf["email"]["from_address"] or EMAIL_HOST_USER
EMAIL_HOST_PASSWORD = conf["email"]["password"]
EMAIL_USE_TLS = True
else:
diff --git a/arkindex/project/tests/config_samples/override.yaml b/arkindex/project/tests/config_samples/override.yaml
index 1de12bd3e8..fed278c1c2 100644
--- a/arkindex/project/tests/config_samples/override.yaml
+++ b/arkindex/project/tests/config_samples/override.yaml
@@ -39,6 +39,7 @@ database:
email:
error_report_recipients:
- noreply@nasa.gov
+ from_address: None
host: smtp.wanadoo.fr
password: hunter2
port: 25
--
GitLab