From 9f212adc1de03e5260ba4846c9d15a1e29e00ae7 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Wed, 28 Nov 2018 11:19:19 +0200
Subject: [PATCH] Rename variable (matrix_synapse_ext_password_provider_ldap ->
 matrix_synapse_ext_password_provider_ldap_enabled)

This makes it more consistent with other usage throughout the playbook.
---
 roles/matrix-server/defaults/main.yml                         | 2 +-
 roles/matrix-server/tasks/setup/setup_synapse_ext.yml         | 2 +-
 ...p_synapse_ext_ldap.yml => setup_synapse_ext_ldap_auth.yml} | 4 ++--
 roles/matrix-server/templates/synapse/homeserver.yaml.j2      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename roles/matrix-server/tasks/setup/{setup_synapse_ext_ldap.yml => setup_synapse_ext_ldap_auth.yml} (66%)

diff --git a/roles/matrix-server/defaults/main.yml b/roles/matrix-server/defaults/main.yml
index f5cab0f3..a6b39532 100644
--- a/roles/matrix-server/defaults/main.yml
+++ b/roles/matrix-server/defaults/main.yml
@@ -153,7 +153,7 @@ matrix_synapse_ext_password_provider_shared_secret_auth_download_url: "https://r
 matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret: ""
 
 # Enable this to activate LDAP password provider
-matrix_synapse_ext_password_provider_ldap: false
+matrix_synapse_ext_password_provider_ldap_enabled: false
 matrix_synapse_ext_password_provider_ldap_uri: "ldap://ldap.mydomain.tld:389"
 matrix_synapse_ext_password_provider_ldap_start_tls: true
 matrix_synapse_ext_password_provider_ldap_base: ""
diff --git a/roles/matrix-server/tasks/setup/setup_synapse_ext.yml b/roles/matrix-server/tasks/setup/setup_synapse_ext.yml
index 058cbc24..e5b3067c 100644
--- a/roles/matrix-server/tasks/setup/setup_synapse_ext.yml
+++ b/roles/matrix-server/tasks/setup/setup_synapse_ext.yml
@@ -4,7 +4,7 @@
 
 - include: tasks/setup/setup_synapse_ext_shared_secret_auth.yml
 
-- include: tasks/setup/setup_synapse_ext_ldap.yml
+- include: tasks/setup/setup_synapse_ext_ldap_auth.yml
 
 - include: tasks/setup/setup_synapse_ext_mautrix_telegram.yml
 
diff --git a/roles/matrix-server/tasks/setup/setup_synapse_ext_ldap.yml b/roles/matrix-server/tasks/setup/setup_synapse_ext_ldap_auth.yml
similarity index 66%
rename from roles/matrix-server/tasks/setup/setup_synapse_ext_ldap.yml
rename to roles/matrix-server/tasks/setup/setup_synapse_ext_ldap_auth.yml
index abe9d3bd..8c87e8e5 100644
--- a/roles/matrix-server/tasks/setup/setup_synapse_ext_ldap.yml
+++ b/roles/matrix-server/tasks/setup/setup_synapse_ext_ldap_auth.yml
@@ -1,11 +1,11 @@
 - set_fact:
     matrix_synapse_password_providers_enabled: true
-  when: "matrix_synapse_ext_password_provider_ldap"
+  when: "matrix_synapse_ext_password_provider_ldap_enabled"
 
 - set_fact:
     matrix_synapse_additional_loggers: >
       {{ matrix_synapse_additional_loggers }}
       +
       {{ [{'name': 'ldap_auth_provider', 'level': 'INFO'}] }}
-  when: "matrix_synapse_ext_password_provider_ldap"
+  when: "matrix_synapse_ext_password_provider_ldap_enabled"
 
diff --git a/roles/matrix-server/templates/synapse/homeserver.yaml.j2 b/roles/matrix-server/templates/synapse/homeserver.yaml.j2
index 0840f5b3..a0e23ab6 100644
--- a/roles/matrix-server/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-server/templates/synapse/homeserver.yaml.j2
@@ -649,7 +649,7 @@ password_providers:
     config:
       sharedSecret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret }}"
 {% endif %}
-{% if matrix_synapse_ext_password_provider_ldap %}
+{% if matrix_synapse_ext_password_provider_ldap_enabled %}
   - module: "ldap_auth_provider.LdapAuthProvider"
     config:
       enabled: true