diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-20 19:41:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-20 19:41:51 +0100 |
commit | ac49c7932d848fbb946c37a69f42b7dbc774c56c (patch) | |
tree | 686b1f5b272ec3daac132f10ebf554a48f36854a /config | |
parent | 61dcb686a8f0a3272e2948c9a072aa58593a7409 (diff) |
Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)
Fix #6816, fix #6790
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/devise.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 97757d0fb..e0d263f16 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -55,6 +55,8 @@ module Devise @@ldap_bind_dn = nil mattr_accessor :ldap_password @@ldap_password = nil + mattr_accessor :ldap_tls_no_verify + @@ldap_tls_no_verify = false class Strategies::PamAuthenticatable def valid? @@ -357,5 +359,6 @@ Devise.setup do |config| config.ldap_bind_dn = ENV.fetch('LDAP_BIND_DN') config.ldap_password = ENV.fetch('LDAP_PASSWORD') config.ldap_uid = ENV.fetch('LDAP_UID', 'cn') + config.ldap_tls_no_verify = ENV['LDAP_TLS_NO_VERIFY'] == 'true' end end |