From 77d292713fc6ab5a37f4fe8c8cc19e872fc8ac7d Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Sun, 7 Mar 2021 19:16:44 +0100
Subject: [PATCH] [mailman] Use multiple domains for mailman-web
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
group_vars/mailman.yml | 4 +++-
roles/mailman3/templates/mailman3/mailman-web.py.j2 | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/group_vars/mailman.yml b/group_vars/mailman.yml
index 842f513d..19a39300 100644
--- a/group_vars/mailman.yml
+++ b/group_vars/mailman.yml
@@ -74,6 +74,8 @@ glob_mailman3:
restadmin_pass: "{{ vault.mailman3_restadmin_pass }}"
archiver_key: "{{ vault.mailman3_archiver_key }}"
web_secret_key: "{{ vault.mailman3_web_secret_key }}"
- web_domain: "mailman.crans.org"
+ web_domains:
+ - "mailman.crans.org"
+ - "lists.crans.org"
default_domain: "crans.org"
postfix_domain: "crans.org"
diff --git a/roles/mailman3/templates/mailman3/mailman-web.py.j2 b/roles/mailman3/templates/mailman3/mailman-web.py.j2
index 81e856a2..1d0c46f8 100644
--- a/roles/mailman3/templates/mailman3/mailman-web.py.j2
+++ b/roles/mailman3/templates/mailman3/mailman-web.py.j2
@@ -16,9 +16,9 @@ ADMINS = (
# is meant to run behind a webserver reverse proxy anyway.
ALLOWED_HOSTS = [
"localhost", # Archiving API from Mailman, keep it.
- "{{ mailman3.web_domain }}",
- # Add here all production URLs you may have.
- #'*'
+{% for domain in mailman3.web_domains %}
+ "{{ domain }}",
+{% endfor %}
]
# Mailman API credentials
--
GitLab