瀏覽代碼

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.
pull/45/head
Slavi Pantaleev 7 年之前
父節點
當前提交
9f212adc1d
共有 4 個文件被更改,包括 5 次插入5 次删除
  1. +1
    -1
      roles/matrix-server/defaults/main.yml
  2. +1
    -1
      roles/matrix-server/tasks/setup/setup_synapse_ext.yml
  3. +2
    -2
      roles/matrix-server/tasks/setup/setup_synapse_ext_ldap_auth.yml
  4. +1
    -1
      roles/matrix-server/templates/synapse/homeserver.yaml.j2

+ 1
- 1
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: "" 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_enabled: 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_start_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: ""


+ 1
- 1
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_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 - include: tasks/setup/setup_synapse_ext_mautrix_telegram.yml




roles/matrix-server/tasks/setup/setup_synapse_ext_ldap.yml → roles/matrix-server/tasks/setup/setup_synapse_ext_ldap_auth.yml 查看文件

@@ -1,11 +1,11 @@
- set_fact: - set_fact:
matrix_synapse_password_providers_enabled: true matrix_synapse_password_providers_enabled: true
when: "matrix_synapse_ext_password_provider_ldap"
when: "matrix_synapse_ext_password_provider_ldap_enabled"


- set_fact: - set_fact:
matrix_synapse_additional_loggers: > matrix_synapse_additional_loggers: >
{{ matrix_synapse_additional_loggers }} {{ matrix_synapse_additional_loggers }}
+ +
{{ [{'name': 'ldap_auth_provider', 'level': 'INFO'}] }} {{ [{'name': 'ldap_auth_provider', 'level': 'INFO'}] }}
when: "matrix_synapse_ext_password_provider_ldap"
when: "matrix_synapse_ext_password_provider_ldap_enabled"



+ 1
- 1
roles/matrix-server/templates/synapse/homeserver.yaml.j2 查看文件

@@ -649,7 +649,7 @@ password_providers:
config: config:
sharedSecret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret }}" sharedSecret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret }}"
{% endif %} {% endif %}
{% if matrix_synapse_ext_password_provider_ldap %}
{% if matrix_synapse_ext_password_provider_ldap_enabled %}
- module: "ldap_auth_provider.LdapAuthProvider" - module: "ldap_auth_provider.LdapAuthProvider"
config: config:
enabled: true enabled: true


Loading…
取消
儲存