From 897190bcc608a4deace0068451d5d1a3a7a0b81b Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Thu, 27 Jun 2024 12:53:03 +0200 Subject: [PATCH] [mailman3] Fix for production deployment Don't use the same name for variables in ansible-private and playbook. Remove fedmsg. Signed-off-by: Michal Konecny --- playbooks/groups/mailman.yml | 10 ++++------ roles/mailman3/defaults/main.yml | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 76d632a5b5..2ab6bc607c 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -96,8 +96,8 @@ roles: - role: mailman3 - mailman_rest_api_user: "{{ mailman_rest_api_user }}" - mailman_rest_api_pass: "{{ mailman_rest_api_pass }}" + mailman_rest_api_username: "{{ mailman_rest_api_user }}" + mailman_rest_api_password: "{{ mailman_rest_api_pass }}" mailman_mailman_db_pass: "{{ mailman_mm_db_pass }}" mailman_hyperkitty_admin_db_pass: "{{ mailman_hk_admin_db_pass }}" mailman_hyperkitty_db_pass: "{{ mailman_hk_db_pass }}" @@ -107,8 +107,8 @@ when: env != "staging" - role: mailman3 mailman_log_level: debug - mailman_rest_api_user: "{{ mailman_stg_rest_api_user }}" - mailman_rest_api_pass: "{{ mailman_stg_rest_api_pass }}" + mailman_rest_api_username: "{{ mailman_stg_rest_api_user }}" + mailman_rest_api_password: "{{ mailman_stg_rest_api_pass }}" mailman_mailman_db_pass: "{{ mailman_mm_db_pass }}" mailman_hyperkitty_admin_db_pass: "{{ mailman_hk_admin_db_pass }}" mailman_hyperkitty_db_pass: "{{ mailman_hk_db_pass }}" @@ -117,8 +117,6 @@ mailman_openidc_server_url: "https://id.stg.fedoraproject.org/" mailman_httpd_hostname: lists.stg.fedoraproject.org when: env == "staging" - - {role: fedmsg/base, - when: env != "staging"} # Set up for fedora-messaging - role: rabbit/user username: "mailman{{ env_suffix }}" diff --git a/roles/mailman3/defaults/main.yml b/roles/mailman3/defaults/main.yml index 83575db719..229026ff03 100644 --- a/roles/mailman3/defaults/main.yml +++ b/roles/mailman3/defaults/main.yml @@ -2,8 +2,8 @@ # Mailman core settings mailman_webui_basedir: /srv/webui mailman_webui_confdir: /etc/mailman3 -mailman_rest_api_user: restadmin -mailman_rest_api_pass: changeme +mailman_rest_api_username: restadmin +mailman_rest_api_password: changeme mailman_rest_api_workers: 2 mailman_log_directory: /var/log/mailman3 mailman_log_level: info