Fix LDAP TLS authentication

2014-06-19 10:41:23 +02:00 · 2014-06-19 10:41:23 +02:00 · bac7d17c7b
parent 67934145e8
commit bac7d17c7b
1 changed files with 9 additions and 1 deletions
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@ -14,7 +14,15 @@ module Gitlab
      end

      def self.adapter_options
-        encryption = config['method'].to_s == 'ssl' ? :simple_tls : nil
+        encryption =
+          case config['method'].to_s
+          when 'ssl'
+            :simple_tls
+          when 'tls'
+            :start_tls
+          else
+            nil
+          end

        options = {
          host: config['host'],