diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index e72f714277..25cee1a4af 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -97,8 +97,15 @@ - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" roles: - - /srv/web/infra/ansible/roles/mailman - /srv/web/infra/ansible/roles/fedmsg_base + - role: /srv/web/infra/ansible/roles/mailman + mailman_dbserver: db02.stg.phx2.fedoraproject.org + mailman_postfix_mydestination: "lists.fedoraproject.org, lists.stg.fedoraproject.org" + mailman_mm_db_pass: "{{ mailman_mm_db_pass }}" + mailman_hk_admin_db_pass: "{{ mailman_hk_admin_db_pass }}" + mailman_hk_db_pass: "{{ mailman_hk_db_pass }}" + mailman_ks_admin_db_pass: "{{ mailman_ks_admin_db_pass }}" + mailman_ks_db_pass: "{{ mailman_ks_db_pass }}" tasks: - name: install more needed packages diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml index 681ca96f3b..e770e7048c 100644 --- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml @@ -115,18 +115,16 @@ - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" - vars: - # override roles variables - - mailman_dbserver: localhost - - mailman_postfix_mydestination: lists-dev.cloud.fedoraproject.org - - mailman_mm_db_pass: "{{ lists_dev_mm_db_pass }}" - - mailman_hk_admin_db_pass: "{{ lists_dev_hk_db_pass }}" - - mailman_hk_db_pass: "{{ lists_dev_hk_db_pass }}" - - mailman_ks_admin_db_pass: "{{ lists_dev_ks_db_pass }}" - - mailman_ks_db_pass: "{{ lists_dev_ks_db_pass }}" roles: - - /srv/web/infra/ansible/roles/mailman + - role: /srv/web/infra/ansible/roles/mailman + mailman_dbserver: localhost + mailman_postfix_mydestination: lists-dev.cloud.fedoraproject.org + mailman_mm_db_pass: "{{ lists_dev_mm_db_pass }}" + mailman_hk_admin_db_pass: "{{ lists_dev_hk_db_pass }}" + mailman_hk_db_pass: "{{ lists_dev_hk_db_pass }}" + mailman_ks_admin_db_pass: "{{ lists_dev_ks_db_pass }}" + mailman_ks_db_pass: "{{ lists_dev_ks_db_pass }}" tasks: diff --git a/roles/mailman/defaults/main.yml b/roles/mailman/defaults/main.yml new file mode 100644 index 0000000000..6fb905b432 --- /dev/null +++ b/roles/mailman/defaults/main.yml @@ -0,0 +1,10 @@ +--- +mailman_webui_basedir: /srv/webui +mailman_webui_confdir: ${mailman_webui_basedir}/config +mailman_dbserver: localhost +mailman_postfix_mydestination: "{{ ansible_fqdn }}" +mailman_mm_db_pass: changeme +mailman_hk_admin_db_pass: changeme +mailman_hk_db_pass: changeme +mailman_ks_admin_db_pass: changeme +mailman_ks_db_pass: changeme diff --git a/roles/mailman/vars/main.yml b/roles/mailman/vars/main.yml deleted file mode 100644 index 950feddc86..0000000000 --- a/roles/mailman/vars/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -mailman_webui_basedir: /srv/webui -mailman_webui_confdir: ${mailman_webui_basedir}/config -mailman_dbserver: db02.stg.phx2.fedoraproject.org -mailman_postfix_mydestination: "lists.fedoraproject.org, lists.stg.fedoraproject.org"