From 3ea1fd035fdf582b7fad1e25d5807929336c60c4 Mon Sep 17 00:00:00 2001 From: Emil Tullstedt Date: Wed, 23 Dec 2020 09:14:02 +0100 Subject: [PATCH] LDAP: Update use_ssl documentation (#29964) --- conf/ldap.toml | 4 ++-- docs/sources/auth/ldap.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/ldap.toml b/conf/ldap.toml index b4d7f128c57..4d890b180fc 100644 --- a/conf/ldap.toml +++ b/conf/ldap.toml @@ -7,9 +7,9 @@ host = "127.0.0.1" # Default port is 389 or 636 if use_ssl = true port = 389 -# Set to true if ldap server supports TLS +# Set to true if LDAP server should use an encrypted TLS connection (either with STARTTLS or LDAPS) use_ssl = false -# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS) +# If set to true, use LDAP with STARTTLS instead of LDAPS start_tls = false # set to true if you want to skip ssl cert validation ssl_skip_verify = false diff --git a/docs/sources/auth/ldap.md b/docs/sources/auth/ldap.md index 106c4e5daaa..34f6d0eb568 100644 --- a/docs/sources/auth/ldap.md +++ b/docs/sources/auth/ldap.md @@ -49,9 +49,9 @@ See [configuration examples](#configuration-examples) for more information. host = "127.0.0.1" # Default port is 389 or 636 if use_ssl = true port = 389 -# Set to true if LDAP server supports TLS +# Set to true if LDAP server should use an encrypted TLS connection (either with STARTTLS or LDAPS) use_ssl = false -# Set to true if connect LDAP server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS) +# If set to true, use LDAP with STARTTLS instead of LDAPS start_tls = false # set to true if you want to skip SSL cert validation ssl_skip_verify = false