From 132d5ce608e96b0849b2d6f9fd9ef237d4f75f7f Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Fri, 31 May 2024 11:53:21 +0200 Subject: [PATCH] [mailman3] Fix the initial-data.json dataload The fedora isn't available in allauth library and mailman user needs to have access to initial-data.json Signed-off-by: Michal Konecny --- roles/mailman3/tasks/main.yml | 2 +- roles/mailman3/templates/settings.py.j2 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/mailman3/tasks/main.yml b/roles/mailman3/tasks/main.yml index b6de3200a2..69eb57882a 100644 --- a/roles/mailman3/tasks/main.yml +++ b/roles/mailman3/tasks/main.yml @@ -213,7 +213,7 @@ src: initial-data.json.j2 dest: "{{ mailman_webui_confdir }}/initial-data.json" owner: root - group: root + group: mailman mode: 0640 tags: - mailman diff --git a/roles/mailman3/templates/settings.py.j2 b/roles/mailman3/templates/settings.py.j2 index 21a051ad76..2bafa1a381 100644 --- a/roles/mailman3/templates/settings.py.j2 +++ b/roles/mailman3/templates/settings.py.j2 @@ -73,7 +73,9 @@ INSTALLED_APPS = ( 'allauth.socialaccount', 'django_mailman3.lib.auth.fedora', {% for service_name, service_data in mailman_login.items() %} +{% if service_data.provider != "fedora" %} 'allauth.socialaccount.providers.{{ service_data.provider }}', +{% endif %} {% endfor %} )