[icinga-checkins] icinga.org: icingaweb2/master: Note that its possible to provide multiple LDAP hosts separated by a space

git at icinga.org git at icinga.org
Mon Dec 12 16:43:28 CET 2016


Module: icingaweb2
Branch: master
Commit: de9474950226c4f227dd35bf31f27d3917809655
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=de9474950226c4f227dd35bf31f27d3917809655

Author: Eric Lippmann <eric.lippmann at icinga.com>
Date:   Mon Dec 12 16:42:56 2016 +0100

Note that its possible to provide multiple LDAP hosts separated by a space

fixes #11809

---

 application/forms/Config/Resource/LdapResourceForm.php |    3 ++-
 doc/04-Resources.md                                    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php
index fd64f36..fa02261 100644
--- a/application/forms/Config/Resource/LdapResourceForm.php
+++ b/application/forms/Config/Resource/LdapResourceForm.php
@@ -46,7 +46,8 @@ class LdapResourceForm extends Form
                 'required'      => true,
                 'label'         => $this->translate('Host'),
                 'description'   => $this->translate(
-                    'The hostname or address of the LDAP server to use for authentication'
+                    'The hostname or address of the LDAP server to use for authentication.'
+                    . ' You can also provide multiple hosts separated by a space'
                 ),
                 'value'         => 'localhost'
             )
diff --git a/doc/04-Resources.md b/doc/04-Resources.md
index 10c6689..a1be358 100644
--- a/doc/04-Resources.md
+++ b/doc/04-Resources.md
@@ -63,7 +63,7 @@ A LDAP resource represents a tree in a LDAP directory. LDAP is usually used for
 | Directive         | Description |
 | ----------------- | ----------- |
 | **type**          | `ldap` |
-| **hostname**      | Connect to the LDAP server on the given host. |
+| **hostname**      | Connect to the LDAP server on the given host. You can also provide multiple hosts separated by a space. |
 | **port**          | Port number to use for the connection. |
 | **root_dn**       | Root object of the tree, e.g. `ou=people,dc=icinga,dc=org` |
 | **bind_dn**       | The user to use when connecting to the server. |



More information about the icinga-checkins mailing list