diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d9edbb..59bb89d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch ## [Unreleased](https://github.com/idealista/clickhouse_role/tree/develop) +## [3.3.4(https://github.com/idealista/clickhouse_role/tree/3.3.4 (2023-05-29) + +### :heavy_plus_sign: Added + +- [#53](https://github.com/idealista/clickhouse_role/issues/53) Add LDAP support for authentication. + ## [3.3.3(https://github.com/idealista/clickhouse_role/tree/3.3.3 (2023-03-27) ### :repeat: Updated diff --git a/defaults/main.yml b/defaults/main.yml index 9add78b..06e16a3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -246,6 +246,9 @@ clickhouse_preferserverciphers_client: true clickhouse_invalidcertificatehandler: name: RejectCertificateHandler # Use for self-signed: AcceptCertificateHandler +# Specify backend authenticacion: AD / LDAP (By default, AD) +clickhouse_auth_backend: AD + # LDAP # clickhouse_ldap: # serverame: diff --git a/templates/config.xml.j2 b/templates/config.xml.j2 index be0b597..9277126 100644 --- a/templates/config.xml.j2 +++ b/templates/config.xml.j2 @@ -508,11 +508,11 @@ {% if clickhouse_ldap.port is defined -%}{{ clickhouse_ldap.port }}{% endif -%} {% if clickhouse_ldap.bind_dn is defined -%}{{ clickhouse_ldap.bind_dn }}{% endif -%} {% if clickhouse_ldap.base_dn is defined or clickhouse_ldap.scope or clickhouse_ldap.search_filter -%} - + {% if clickhouse_auth_backend == 'AD' -%}{% endif -%} {% if clickhouse_ldap.base_dn is defined -%}{{ clickhouse_ldap.base_dn }}{% endif -%} {% if clickhouse_ldap.scope is defined -%}{{ clickhouse_ldap.scope }}{% endif -%} {% if clickhouse_ldap.search_filter is defined -%}{{ clickhouse_ldap.search_filter }}{% endif -%} - + {% if clickhouse_auth_backend == 'AD' -%}{% endif -%} {% endif -%} {% if clickhouse_ldap.verification_cooldown is defined -%}{{ clickhouse_ldap.verification_cooldown }}{% endif -%} {% if clickhouse_ldap.enable_tls is defined -%}{{ clickhouse_ldap.enable_tls }}{% endif -%}