diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-20 19:17:20 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-20 19:17:20 +0000 |
| commit | e8aeec4fead8810ee2efcdb2b0198941dfb168ee (patch) | |
| tree | 887c56068d4d89f44c3348b999b353e1b1bc12bf /config/initializers | |
| parent | 2649cce3a065f3825d63b7f7be341787aa1d2f9a (diff) | |
| parent | ac49c7932d848fbb946c37a69f42b7dbc774c56c (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/initializers')
| -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 |