summaryrefslogtreecommitdiff
path: root/doc/administration/auth/ldap/google_secure_ldap.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-10 21:10:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-10 21:10:15 +0000
commite109a7799eb2c5598211c4cc1e0c83d5beb44018 (patch)
treed72aa61dbb5b04bb0f25232660591963bc1f03b8 /doc/administration/auth/ldap/google_secure_ldap.md
parentcba8ff64401258aa68eebd7603d4022884ed0a45 (diff)
downloadgitlab-ce-e109a7799eb2c5598211c4cc1e0c83d5beb44018.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth/ldap/google_secure_ldap.md')
-rw-r--r--doc/administration/auth/ldap/google_secure_ldap.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/administration/auth/ldap/google_secure_ldap.md b/doc/administration/auth/ldap/google_secure_ldap.md
index fe54962538a..dcfb77f277e 100644
--- a/doc/administration/auth/ldap/google_secure_ldap.md
+++ b/doc/administration/auth/ldap/google_secure_ldap.md
@@ -210,6 +210,11 @@ values obtained during the LDAP client configuration earlier:
1. Save the file and [restart](../../restart_gitlab.md#installations-from-source) GitLab for the changes to take effect.
+## Using encrypted credentials
+
+You can optionally store the `bind_dn` and `password` in a separate encrypted configuration file using the
+[same steps as the regular LDAP integration](index.md#using-encrypted-credentials).
+
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues