infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

[mailman3] Move the staging/prod vars to respective group_vars

Browse source 
This will make the mailman playbook much cleaner. Thanks @arrfab for the idea.

Signed-off-by: Michal Konecny <mkonecny@redhat.com>
This commit is contained in:
Michal Konecny 2024-07-04 10:11:05 +02:00
parent bebc73c9e3
commit 14ee2219b6
3 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inventory/group_vars/mailman
View file

@ -69,3 +69,13 @@ primary_auth_source: ipa
tcp_ports: [25, 80, 443,
# For outgoing fedmsg
3000, 3001, 3002, 3003]
# mailman role variables
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 }}"
mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
mailman_hyperkitty_archiver_key: "{{ mailman_hk_archiver_key }}"
mailman_smtp_port: 587

12
inventory/group_vars/mailman_stg
View file

@ -62,3 +62,15 @@ postfix_group: mailman-stg
tcp_ports: [25, 80, 443,
# For outbound fedmsg
3000, 3001, 3002, 3003]
# mailman role variables
mailman_log_level: debug
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 }}"
mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
mailman_hyperkitty_archiver_key: "{{ mailman_hk_stg_archiver_key }}"
mailman_openidc_server_url: "https://id.stg.fedoraproject.org/"
mailman_httpd_hostname: lists.stg.fedoraproject.org

21
playbooks/groups/mailman.yml
View file

@ -96,27 +96,6 @@
roles:
- role: mailman3
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 }}"
mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
mailman_hyperkitty_archiver_key: "{{ mailman_hk_archiver_key }}"
mailman_smtp_port: 587
when: env != "staging"
- role: mailman3
mailman_log_level: debug
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 }}"
mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
mailman_hyperkitty_archiver_key: "{{ mailman_hk_stg_archiver_key }}"
mailman_openidc_server_url: "https://id.stg.fedoraproject.org/"
mailman_httpd_hostname: lists.stg.fedoraproject.org
when: env == "staging"
# Set up for fedora-messaging
- role: rabbit/user
username: "mailman{{ env_suffix }}"