From e9d3f13c5207163750a00b0cd9cc39c30461abcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 8 Sep 2016 07:10:07 +0000
Subject: [PATCH] Mailman: fix login variable names

---
 inventory/group_vars/mailman                 | 2 +-
 inventory/group_vars/mailman-stg             | 2 +-
 roles/mailman/templates/initial-data.json.j2 | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inventory/group_vars/mailman b/inventory/group_vars/mailman
index 5402cbe1f3..41dd8cd7f4 100644
--- a/inventory/group_vars/mailman
+++ b/inventory/group_vars/mailman
@@ -35,7 +35,7 @@ mailman_db_server: db01.phx2.fedoraproject.org
 mailman_domains:
 - lists.fedoraproject.org
 - lists.fedorahosted.org
-mailman_social_login:
+mailman_login:
   gitlab:
     display_name: GitLab
     provider: gitlab
diff --git a/inventory/group_vars/mailman-stg b/inventory/group_vars/mailman-stg
index a33da96b01..6abfc9c861 100644
--- a/inventory/group_vars/mailman-stg
+++ b/inventory/group_vars/mailman-stg
@@ -34,7 +34,7 @@ mailman_db_server: db01.stg.phx2.fedoraproject.org
 mailman_domains:
 - lists.stg.fedoraproject.org
 - lists.stg.fedorahosted.org
-mailman_social_login:
+mailman_login:
   gitlab:
     display_name: GitLab
     provider: gitlab
diff --git a/roles/mailman/templates/initial-data.json.j2 b/roles/mailman/templates/initial-data.json.j2
index 5cf943bf37..841069c923 100644
--- a/roles/mailman/templates/initial-data.json.j2
+++ b/roles/mailman/templates/initial-data.json.j2
@@ -9,7 +9,7 @@
     "pk": {{ loop.index }}
 },
 {% endfor %}
-{% for service_name, service_data in mailman_social_login.items() %}
+{% for service_name, service_data in mailman_login.items() %}
 {
     "fields": {
         "name": "{{ service_data.display_name }}",
@@ -18,8 +18,8 @@
             {{ loop.index }}{% if not loop.last %},{% endif %}
             {% endfor %}
         ],
-        "client_id": "{{ mailman_social_login_secrets[service_name].client_id }}",
-        "secret": "{{ mailman_social_login_secrets[service_name].secret }}",
+        "client_id": "{{ mailman_login_secrets[service_name].client_id }}",
+        "secret": "{{ mailman_login_secrets[service_name].secret }}",
         "key": "",
         "provider": "{{ service_data.provider }}"
     },