Skip to content

Shorter prefix for LDAP conf keys in test snippets #1103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions docs/rabbitmq.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -660,25 +660,25 @@
## Specify servers to bind to. You *must* set this in order for the plugin
## to work properly.
##
# ldap.servers.1 = your-server-name-goes-here
# auth_ldap.servers.1 = your-server-name-goes-here

## You can define multiple servers
# ldap.servers.2 = your-other-server
# auth_ldap.servers.2 = your-other-server

## Connect to the LDAP server using SSL
##
# ldap.use_ssl = false
# auth_ldap.use_ssl = false

## Specify the LDAP port to connect to
##
# ldap.port = 389
# auth_ldap.port = 389

## LDAP connection timeout, in milliseconds or 'infinity'
##
# ldap.timeout = infinity
# auth_ldap.timeout = infinity

## Or number
# ldap.timeout = 500
# auth_ldap.timeout = 500

## Enable logging of LDAP queries.
## One of
Expand All @@ -688,11 +688,11 @@
##
## Defaults to false.
##
# ldap.log = false
# auth_ldap.log = false

## Also can be true or network
# ldap.log = true
# ldap.log = network
# auth_ldap.log = true
# auth_ldap.log = network

##
## Authentication
Expand All @@ -702,7 +702,7 @@
## Pattern to convert the username given through AMQP to a DN before
## binding
##
# ldap.user_dn_pattern = cn=${username},ou=People,dc=example,dc=com
# auth_ldap.user_dn_pattern = cn=${username},ou=People,dc=example,dc=com

## Alternatively, you can convert a username to a Distinguished
## Name via an LDAP lookup after binding. See the documentation for
Expand All @@ -712,8 +712,8 @@
## the name of the attribute that represents the user name, and the
## base DN for the lookup query.
##
# ldap.dn_lookup_attribute = userPrincipalName
# ldap.dn_lookup_base = DC=gopivotal,DC=com
# auth_ldap.dn_lookup_attribute = userPrincipalName
# auth_ldap.dn_lookup_base = DC=gopivotal,DC=com

## Controls how to bind for authorisation queries and also to
## retrieve the details of users logging in without presenting a
Expand All @@ -725,11 +725,11 @@
##
## Defaults to 'as_user'.
##
# ldap.other_bind = as_user
# auth_ldap.other_bind = as_user

## Or can be more complex:
# ldap.other_bind.user_dn = User
# ldap.other_bind.password = Password
# auth_ldap.other_bind.user_dn = User
# auth_ldap.other_bind.password = Password

## If user_dn and password defined - other options is ignored.

Expand Down
138 changes: 0 additions & 138 deletions rabbitmq.conf.d/ldap.conf

This file was deleted.

Loading