finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoiding if(s), fix #1083

Browse Source 
Conversation: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1083#discussion_r638671860

Signed-off-by: Ahmad Haghighi <haghighi@fedoraproject.org>
This commit is contained in:
Ahmad Haghighi 2021-05-25 15:41:38 +04:30
parent ee088d5d46
commit 209d59070e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-synapse/defaults/main.yml
View File

@ -497,7 +497,7 @@ matrix_synapse_ext_password_provider_ldap_attributes_name: "cn"
matrix_synapse_ext_password_provider_ldap_bind_dn: "" matrix_synapse_ext_password_provider_ldap_bind_dn: ""
matrix_synapse_ext_password_provider_ldap_bind_password: "" matrix_synapse_ext_password_provider_ldap_bind_password: ""
matrix_synapse_ext_password_provider_ldap_filter: "" matrix_synapse_ext_password_provider_ldap_filter: ""
matrix_synapse_ext_password_provider_ldap_is_active_directory: false matrix_synapse_ext_password_provider_ldap_active_directory: false
matrix_synapse_ext_password_provider_ldap_default_domain: "" matrix_synapse_ext_password_provider_ldap_default_domain: ""
# Enable this to activate the Synapse Antispam spam-checker module. # Enable this to activate the Synapse Antispam spam-checker module.

6
roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
View File

@ -2596,12 +2596,8 @@ password_providers:
uri: {{ matrix_synapse_ext_password_provider_ldap_uri|string|to_json }} uri: {{ matrix_synapse_ext_password_provider_ldap_uri|string|to_json }}
start_tls: {{ matrix_synapse_ext_password_provider_ldap_start_tls|to_json }} start_tls: {{ matrix_synapse_ext_password_provider_ldap_start_tls|to_json }}
base: {{ matrix_synapse_ext_password_provider_ldap_base|string|to_json }} base: {{ matrix_synapse_ext_password_provider_ldap_base|string|to_json }}
{% if matrix_synapse_ext_password_provider_ldap_is_active_directory %} active_directory: {{ matrix_synapse_ext_password_provider_ldap_active_directory|to_json }}
active_directory: true
{% endif %}
{% if matrix_synapse_ext_password_provider_ldap_default_domain != '' %}
default_domain: {{ matrix_synapse_ext_password_provider_ldap_default_domain|string|to_json }} default_domain: {{ matrix_synapse_ext_password_provider_ldap_default_domain|string|to_json }}
{% endif %}
attributes: attributes:
uid: {{ matrix_synapse_ext_password_provider_ldap_attributes_uid|string|to_json }} uid: {{ matrix_synapse_ext_password_provider_ldap_attributes_uid|string|to_json }}
mail: {{ matrix_synapse_ext_password_provider_ldap_attributes_mail|string|to_json }} mail: {{ matrix_synapse_ext_password_provider_ldap_attributes_mail|string|to_json }}