Show More
@@ -163,7 +163,7 b" Here's a typical LDAP setup::" | |||||
163 | Host = host.example.com |
|
163 | Host = host.example.com | |
164 | Account = <account> |
|
164 | Account = <account> | |
165 | Password = <password> |
|
165 | Password = <password> | |
166 |
Connection Security = LDAPS |
|
166 | Connection Security = LDAPS | |
167 | Certificate Checks = DEMAND |
|
167 | Certificate Checks = DEMAND | |
168 |
|
168 | |||
169 | Search settings |
|
169 | Search settings | |
@@ -457,7 +457,7 b' could set the request headers however yo' | |||||
457 | from mod_python import apache |
|
457 | from mod_python import apache | |
458 | import ldap |
|
458 | import ldap | |
459 |
|
459 | |||
460 |
LDAP_SERVER = "ldap://server.mydomain.com: |
|
460 | LDAP_SERVER = "ldaps://server.mydomain.com:636" | |
461 | LDAP_USER = "" |
|
461 | LDAP_USER = "" | |
462 | LDAP_PASS = "" |
|
462 | LDAP_PASS = "" | |
463 | LDAP_ROOT = "dc=mydomain,dc=com" |
|
463 | LDAP_ROOT = "dc=mydomain,dc=com" |
@@ -3,7 +3,7 b' api_url = http://kallithea.example.com/_' | |||||
3 | api_user = admin |
|
3 | api_user = admin | |
4 | api_key = XXXXXXXXXXXX |
|
4 | api_key = XXXXXXXXXXXX | |
5 |
|
5 | |||
6 |
ldap_uri = ldap://ldap.example.com: |
|
6 | ldap_uri = ldaps://ldap.example.com:636 | |
7 | ldap_user = cn=kallithea,dc=example,dc=com |
|
7 | ldap_user = cn=kallithea,dc=example,dc=com | |
8 | ldap_key = XXXXXXXXX |
|
8 | ldap_key = XXXXXXXXX | |
9 | base_dn = dc=example,dc=com |
|
9 | base_dn = dc=example,dc=com |
@@ -50,7 +50,7 b' except ImportError:' | |||||
50 | class AuthLdap(object): |
|
50 | class AuthLdap(object): | |
51 |
|
51 | |||
52 | def __init__(self, server, base_dn, port=None, bind_dn='', bind_pass='', |
|
52 | def __init__(self, server, base_dn, port=None, bind_dn='', bind_pass='', | |
53 |
tls_kind=' |
|
53 | tls_kind='LDAPS', tls_reqcert='DEMAND', cacertdir=None, ldap_version=3, | |
54 | ldap_filter='(&(objectClass=user)(!(objectClass=computer)))', |
|
54 | ldap_filter='(&(objectClass=user)(!(objectClass=computer)))', | |
55 | search_scope='SUBTREE', attr_login='uid'): |
|
55 | search_scope='SUBTREE', attr_login='uid'): | |
56 | if ldap is None: |
|
56 | if ldap is None: | |
@@ -215,7 +215,7 b' class KallitheaAuthPlugin(auth_modules.K' | |||||
215 | "type": "select", |
|
215 | "type": "select", | |
216 | "values": self._tls_kind_values, |
|
216 | "values": self._tls_kind_values, | |
217 | "description": "TLS Type", |
|
217 | "description": "TLS Type", | |
218 |
"default": ' |
|
218 | "default": 'LDAPS', | |
219 | "formname": "Connection Security" |
|
219 | "formname": "Connection Security" | |
220 | }, |
|
220 | }, | |
221 | { |
|
221 | { |
General Comments 0
You need to be logged in to leave comments.
Login now