浏览代码

[desktop] Change comments describing LDAPS config

Abraham Elmahrek 12 年之前
父节点
当前提交
b3c118b
共有 3 个文件被更改,包括 11 次插入3 次删除
  1. 5 1
      desktop/conf.dist/hue.ini
  2. 5 1
      desktop/conf/pseudo-distributed.ini.tmpl
  3. 1 1
      desktop/core/src/desktop/conf.py

+ 5 - 1
desktop/conf.dist/hue.ini

@@ -118,7 +118,11 @@
   # URL of the LDAP server
   ## ldap_url=ldap://auth.mycompany.com
 
-  # Path to certificate for authentication over TLS
+  # A PEM-format file containing certificates for the CA's that
+  # Hue will trust for authentication over TLS.
+  # The certificate for the CA that signed the
+  # LDAP server certificate must be included among these certificates.
+  # See more here http://www.openldap.org/doc/admin24/tls.html.
   ## ldap_cert=
 
   # Distinguished name of the user to bind as -- not necessary if the LDAP server

+ 5 - 1
desktop/conf/pseudo-distributed.ini.tmpl

@@ -127,7 +127,11 @@
   # URL of the LDAP server
   ## ldap_url=ldap://auth.mycompany.com
 
-  # Path to certificate for authentication over TLS
+  # A PEM-format file containing certificates for the CA's that
+  # Hue will trust for authentication over TLS.
+  # The certificate for the CA that signed the
+  # LDAP server certificate must be included among these certificates.
+  # See more here http://www.openldap.org/doc/admin24/tls.html.
   ## ldap_cert=
 
   # Distinguished name of the user to bind as -- not necessary if the LDAP server

+ 1 - 1
desktop/core/src/desktop/conf.py

@@ -299,7 +299,7 @@ LDAP = ConfigSection(
                      help=_("The LDAP URL to connect to.")),
     LDAP_CERT=Config("ldap_cert",
                      default=None,
-                     help=_("The LDAP certificate for authentication over TLS.")),
+                     help=_("A PEM-format file containing certificates for the CA's that Hue will trust for authentication over TLS. The certificate for the CA that signed the LDAP server certificate must be included among these certificates. See more here http://www.openldap.org/doc/admin24/tls.html.")),
     LDAP_USERNAME_PATTERN=Config("ldap_username_pattern",
                                  default=None,
                                  help=_("A pattern to use for constructing LDAP usernames.")),