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

fix template and vars for ldap auth, add setup

Browse Source
This commit is contained in:
Thomas vO 2018-11-28 09:04:09 +01:00
parent 9cf9a1ec54
commit bbf8928831
4 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
roles/matrix-server/defaults/main.yml
View File

@ -155,13 +155,13 @@ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret: ""
# Enable this to activate LDAP password provider # Enable this to activate LDAP password provider
matrix_synapse_ext_password_provider_ldap: false matrix_synapse_ext_password_provider_ldap: false
matrix_synapse_ext_password_provider_ldap_uri: "ldap://ldap.mydomain.tld:389" matrix_synapse_ext_password_provider_ldap_uri: "ldap://ldap.mydomain.tld:389"
matrix_synapse_ext_password_provider_ldap_tls: true matrix_synapse_ext_password_provider_ldap_start_tls: true
matrix_synapse_ext_password_provider_ldap_base: "" matrix_synapse_ext_password_provider_ldap_base: ""
matrix_synapse_ext_password_provider_ldap_attr_uid: "uid" matrix_synapse_ext_password_provider_ldap_attributes_uid: "uid"
matrix_synapse_ext_password_provider_ldap_attr_mail: "mail" matrix_synapse_ext_password_provider_ldap_attributes_mail: "mail"
matrix_synapse_ext_password_provider_ldap_attr_name: "name" matrix_synapse_ext_password_provider_ldap_attributes_name: "cn"
matrix_synapse_ext_password_provider_ldap_binddn: "" matrix_synapse_ext_password_provider_ldap_bind_dn: ""
matrix_synapse_ext_password_provider_ldap_bindpwd: "" matrix_synapse_ext_password_provider_ldap_bind_password: ""
matrix_synapse_ext_password_provider_ldap_filter: "" matrix_synapse_ext_password_provider_ldap_filter: ""

2
roles/matrix-server/tasks/setup/setup_synapse_ext.yml
View File

@ -4,6 +4,8 @@
- include: tasks/setup/setup_synapse_ext_shared_secret_auth.yml - include: tasks/setup/setup_synapse_ext_shared_secret_auth.yml
- include: tasks/setup/setup_synapse_ext_ldap.yml
- include: tasks/setup/setup_synapse_ext_mautrix_telegram.yml - include: tasks/setup/setup_synapse_ext_mautrix_telegram.yml
- include: tasks/setup/setup_synapse_ext_mautrix_whatsapp.yml - include: tasks/setup/setup_synapse_ext_mautrix_whatsapp.yml

11
roles/matrix-server/tasks/setup/setup_synapse_ext_ldap.yml Normal file
View File

@ -0,0 +1,11 @@
- set_fact:
matrix_synapse_password_providers_enabled: true
when: "matrix_synapse_ext_password_provider_ldap"
- set_fact:
matrix_synapse_additional_loggers: >
{{ matrix_synapse_additional_loggers }}
+
{{ [{'name': 'ldap_auth_provider', 'level': 'INFO'}] }}
when: "matrix_synapse_ext_password_provider_ldap"

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

@ -654,17 +654,15 @@ password_providers:
config: config:
enabled: true enabled: true
uri: "{{ matrix_synapse_ext_password_provider_ldap_uri }}" uri: "{{ matrix_synapse_ext_password_provider_ldap_uri }}"
start_tls: {{ matrix_synapse_ext_password_provider_ldap_tls }} start_tls: "{{ matrix_synapse_ext_password_provider_ldap_start_tls }}"
base: "{{ matrix_synapse_ext_password_provider_ldap_base }}" base: "{{ matrix_synapse_ext_password_provider_ldap_base }}"
attributes: attributes:
uid: "{{ matrix_synapse_ext_password_provider_ldap_attr_uid }}" uid: "{{ matrix_synapse_ext_password_provider_ldap_attributes_uid }}"
mail: "{{ matrix_synapse_ext_password_provider_ldap_attr_mail }}" mail: "{{ matrix_synapse_ext_password_provider_ldap_attributes_mail }}"
name: "{{ matrix_synapse_ext_password_provider_ldap_attr_name }}" name: "{{ matrix_synapse_ext_password_provider_ldap_attributes_name }}"
bind_dn: "{{ matrix_synapse_ext_password_provider_ldap_binddn }}" bind_dn: "{{ matrix_synapse_ext_password_provider_ldap_bind_dn }}"
bind_password: "{{ matrix_synapse_ext_password_provider_ldap_bindpwd }}" bind_password: "{{ matrix_synapse_ext_password_provider_ldap_bind_password }}"
{% if matrix_synapse_ext_password_provider_ldap_filter %}
filter: "{{ matrix_synapse_ext_password_provider_ldap_filter }}" filter: "{{ matrix_synapse_ext_password_provider_ldap_filter }}"
{% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}