diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-15 19:57:09 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-15 19:57:09 +0000 |
| commit | 8b352af4dd4f79432e3e9c48593380292e4002d7 (patch) | |
| tree | 095ae99a4174942d170b14578a9e079077befb1d /config | |
| parent | acf215d983f7a57fb8375184e24d2e04eda74eb5 (diff) | |
| parent | a070dd4a83788dfd76809d8b4ee4111b05cdff47 (diff) | |
| download | pleroma-8b352af4dd4f79432e3e9c48593380292e4002d7.tar.gz pleroma-8b352af4dd4f79432e3e9c48593380292e4002d7.zip | |
Merge branch 'feature/openldap-support' into 'develop'
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 326c4b601..ccdd35777 100644 --- a/config/config.exs +++ b/config/config.exs @@ -370,6 +370,17 @@ config :auto_linker, rel: false ] +config :pleroma, :ldap, + enabled: System.get_env("LDAP_ENABLED") == "true", + host: System.get_env("LDAP_HOST") || "localhost", + port: String.to_integer(System.get_env("LDAP_PORT") || "389"), + ssl: System.get_env("LDAP_SSL") == "true", + sslopts: [], + tls: System.get_env("LDAP_TLS") == "true", + tlsopts: [], + base: System.get_env("LDAP_BASE") || "dc=example,dc=com", + uid: System.get_env("LDAP_UID") || "cn" + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |