浏览代码

HUE-1749 [core] thrift ssl support

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

+ 3 - 3
apps/beeswax/src/beeswax/conf.py

@@ -81,21 +81,21 @@ SSL = ConfigSection(
       key="cacerts",
       key="cacerts",
       help=_t("Path to Certificate Authority certificates."),
       help=_t("Path to Certificate Authority certificates."),
       type=str,
       type=str,
-      default=""
+      default="/etc/hue/cacerts.pem"
     ),
     ),
 
 
     KEY = Config(
     KEY = Config(
       key="key",
       key="key",
       help=_t("Path to the private key file."),
       help=_t("Path to the private key file."),
       type=str,
       type=str,
-      default=""
+      default="/etc/hue/key.pem"
     ),
     ),
 
 
     CERT = Config(
     CERT = Config(
       key="cert",
       key="cert",
       help=_t("Path to the public certificate file."),
       help=_t("Path to the public certificate file."),
       type=str,
       type=str,
-      default=""
+      default="/etc/hue/cert.pem"
     ),
     ),
 
 
     VALIDATE = Config(
     VALIDATE = Config(

+ 4 - 4
desktop/conf.dist/hue.ini

@@ -449,16 +449,16 @@
     ## enabled=false
     ## enabled=false
 
 
     # Path to Certificate Authority certificates.
     # Path to Certificate Authority certificates.
-    ## cacerts=
+    ## cacerts=/etc/hue/cacerts.pem
 
 
     # Path to the private key file.
     # Path to the private key file.
-    ## key=
+    ## key=/etc/hue/key.pem
 
 
     # Path to the public certificate file.
     # Path to the public certificate file.
-    ## cert=
+    ## cert=/etc/hue/cert.pem
 
 
     # Choose whether Hue should validate certificates received from the server.
     # Choose whether Hue should validate certificates received from the server.
-    ## validate=
+    ## validate=true
 
 
 
 
 ###########################################################################
 ###########################################################################

+ 4 - 4
desktop/conf/pseudo-distributed.ini.tmpl

@@ -490,16 +490,16 @@
     ## enabled=false
     ## enabled=false
 
 
     # Path to Certificate Authority certificates.
     # Path to Certificate Authority certificates.
-    ## cacerts=
+    ## cacerts=/etc/hue/cacerts.pem
 
 
     # Path to the private key file.
     # Path to the private key file.
-    ## key=
+    ## key=/etc/hue/key.pem
 
 
     # Path to the public certificate file.
     # Path to the public certificate file.
-    ## cert=
+    ## cert=/etc/hue/cert.pem
 
 
     # Choose whether Hue should validate certificates received from the server.
     # Choose whether Hue should validate certificates received from the server.
-    ## validate=
+    ## validate=true
 
 
 
 
 ###########################################################################
 ###########################################################################