Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Mailman: fix login variable names

Browse source
This commit is contained in:
Aurélien Bompard 2016-09-08 07:10:07 +00:00
parent 430ce45e0d
commit e9d3f13c52
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/mailman
View file

@ -35,7 +35,7 @@ mailman_db_server: db01.phx2.fedoraproject.org
mailman_domains: mailman_domains:
- lists.fedoraproject.org - lists.fedoraproject.org
- lists.fedorahosted.org - lists.fedorahosted.org
mailman_social_login: mailman_login:
gitlab: gitlab:
display_name: GitLab display_name: GitLab
provider: gitlab provider: gitlab

2
inventory/group_vars/mailman-stg
View file

@ -34,7 +34,7 @@ mailman_db_server: db01.stg.phx2.fedoraproject.org
mailman_domains: mailman_domains:
- lists.stg.fedoraproject.org - lists.stg.fedoraproject.org
- lists.stg.fedorahosted.org - lists.stg.fedorahosted.org
mailman_social_login: mailman_login:
gitlab: gitlab:
display_name: GitLab display_name: GitLab
provider: gitlab provider: gitlab

6
roles/mailman/templates/initial-data.json.j2
View file

@ -9,7 +9,7 @@
"pk": {{ loop.index }} "pk": {{ loop.index }}
}, },
{% endfor %} {% endfor %}
{% for service_name, service_data in mailman_social_login.items() %} {% for service_name, service_data in mailman_login.items() %}
{ {
"fields": { "fields": {
"name": "{{ service_data.display_name }}", "name": "{{ service_data.display_name }}",
@ -18,8 +18,8 @@
{{ loop.index }}{% if not loop.last %},{% endif %} {{ loop.index }}{% if not loop.last %},{% endif %}
{% endfor %} {% endfor %}
], ],
"client_id": "{{ mailman_social_login_secrets[service_name].client_id }}", "client_id": "{{ mailman_login_secrets[service_name].client_id }}",
"secret": "{{ mailman_social_login_secrets[service_name].secret }}", "secret": "{{ mailman_login_secrets[service_name].secret }}",
"key": "", "key": "",
"provider": "{{ service_data.provider }}" "provider": "{{ service_data.provider }}"
}, },