From 1d562201edc1afa42574d8e44e0aecffec988b56 Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 27 Jun 2024 13:00:45 +0200 Subject: [PATCH] [mailman3] Use the same variable name everywhere Signed-off-by: Michal Konecny --- roles/mailman3/templates/mailman.cfg.j2 | 4 ++-- roles/mailman3/templates/settings.py.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/mailman3/templates/mailman.cfg.j2 b/roles/mailman3/templates/mailman.cfg.j2 index c64e35727c..04879ba312 100644 --- a/roles/mailman3/templates/mailman.cfg.j2 +++ b/roles/mailman3/templates/mailman.cfg.j2 @@ -44,8 +44,8 @@ enable: yes [webservice] hostname: localhost port: 8001 -admin_user: {{ mailman_rest_api_user }} -admin_pass: {{ mailman_rest_api_pass }} +admin_user: {{ mailman_rest_api_username }} +admin_pass: {{ mailman_rest_api_password }} workers: {{ mailman_rest_api_workers }} {% for item in mailman_log_items %} diff --git a/roles/mailman3/templates/settings.py.j2 b/roles/mailman3/templates/settings.py.j2 index 1d819e645f..55300cc9b5 100644 --- a/roles/mailman3/templates/settings.py.j2 +++ b/roles/mailman3/templates/settings.py.j2 @@ -38,8 +38,8 @@ ALLOWED_HOSTS = [ # Mailman API credentials MAILMAN_REST_API_URL = 'http://localhost:8001' -MAILMAN_REST_API_USER = '{{ mailman_rest_api_user }}' -MAILMAN_REST_API_PASS = '{{ mailman_rest_api_pass }}' +MAILMAN_REST_API_USER = '{{ mailman_rest_api_username }}' +MAILMAN_REST_API_PASS = '{{ mailman_rest_api_password }}' MAILMAN_ARCHIVER_KEY = '{{ mailman_hyperkitty_archiver_key }}' MAILMAN_ARCHIVER_FROM = ('127.0.0.1', '::1')