Add a comment in admin.conf about ldap server failover

diff --git a/Changelog b/Changelog
index 226aec2d9e0bf98dac187164801b9509cfab31ff..8273aaa784775a8c50b057d841f79782ce936a1d 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -25,6 +25,7 @@ Ver 1.60:
 * Allow for normal ldap user attributes to be utf8 encoded instead of ascii. Changing attribute values through
   user_info will not work in that case.
 * Fix a small bug in lib/ldap/defaults.php3. We should not be using $i in a for() loop but a new variable
+* Add a comment in admin.conf about ldap server failover
 Ver 1.59:
 * Small html fixes in user_edit.php3 and password.php3
 * Show number of failed logins in the last 7 days in the user admin page

diff --git a/conf/admin.conf b/conf/admin.conf
index 7992edcbf8b1b42f4a1f7c482078f1ece6ae8872..c5ea4e7c719b830667ac560e2db94b2d96bc9ae7 100644 (file)
--- a/conf/admin.conf
+++ b/conf/admin.conf
@@ -111,6 +111,13 @@ nas3_ip: 147.122.122.124
 nas3_port_num: 210
 nas3_community: public
 
+#
+# The ldap server to connect to.
+# Both ldap_server and ldap_write_server can be a space-separated
+# list of ldap hostnames. In that case the library will try to connect
+# to the servers in the order that they appear. If the first host is down
+# ldap_connect will ask for the second ldap host and so on.
+#
 ldap_server: ldap.%{general_domain}
 #
 # There are many cases where we have a small write master and