浏览代码

[core] Sync the hue.ini templates

Romain Rigaux 10 年之前
父节点
当前提交
75d540f

+ 12 - 2
desktop/conf.dist/hue.ini

@@ -37,6 +37,9 @@
   # Enable or disable database debug mode.
   ## database_logging=false
 
+  # Whether to send debug messages from JavaScript to the server logs.
+  ## send_dbug_messages=false
+
   # Enable or disable backtrace for server error
   http_500_debug_mode=false
 
@@ -93,6 +96,7 @@
   ## validate=true
 
   # Default LDAP/PAM/.. username and password of the hue user used for authentications with other services.
+  # Inactive if password is empty.
   # e.g. LDAP pass-through authentication for HiveServer2 or Impala. Apps can override them individually.
   ## auth_username=hue
   ## auth_password=
@@ -197,6 +201,10 @@
     # e.g. <H2>Test Lab A2 Hue Services</H2>
     ## banner_top_html=
 
+    # Login splash HTML code
+    # e.g. WARNING: You are required to have authorization before you proceed
+    ## login_splash_html=
+
   # Configuration options for user authentication into the web application
   # ------------------------------------------------------------------------
   [[auth]]
@@ -214,6 +222,8 @@
     # - libopenid.backend.OpenIDBackend
     # - liboauth.backend.OAuthBackend
     #     (New oauth, support Twitter, Facebook, Google+ and Linkedin
+    # Multiple Authentication backends are supported by specifying a comma-separated list in order of priority.
+    # However, in order to enable OAuthBackend, it must be the ONLY backend configured.
     ## backend=desktop.auth.backend.AllowFirstUserDjangoBackend
 
     # The service to use when querying PAM.
@@ -716,7 +726,7 @@
     ## validate=true
 
   # Override the default desktop username and password of the hue user used for authentications with other services.
-  # e.g. LDAP/PAM pass-through authentication.
+  # e.g. Used for LDAP/PAM pass-through authentication.
   ## auth_username=hue
   ## auth_password=
 
@@ -765,7 +775,7 @@
     ## validate=true
 
   # Override the desktop default username and password of the hue user used for authentications with other services.
-  # e.g. LDAP/PAM pass-through authentication.
+  # e.g. Used for LDAP/PAM pass-through authentication.
   ## auth_username=hue
   ## auth_password=
 

+ 19 - 6
desktop/conf/pseudo-distributed.ini.tmpl

@@ -1,3 +1,7 @@
+#####################################
+# DEVELOPMENT EDITION
+#####################################
+
 # Hue configuration file
 # ===================================
 #
@@ -26,19 +30,22 @@
 
   # Webserver listens on this address and port
   http_host=0.0.0.0
-  http_port=8888
+  http_port=8000
 
   # Time zone name
   time_zone=America/Los_Angeles
 
   # Enable or disable Django debug mode.
-  django_debug_mode=false
+  ## django_debug_mode=true
 
   # Enable or disable database debug mode.
   ## database_logging=false
 
+  # Whether to send debug messages from JavaScript to the server logs.
+  send_dbug_messages=true
+
   # Enable or disable backtrace for server error
-  http_500_debug_mode=false
+  ## http_500_debug_mode=true
 
   # Enable or disable memory profiling.
   ## memory_profiler=false
@@ -93,6 +100,7 @@
   ## validate=true
 
   # Default LDAP/PAM/.. username and password of the hue user used for authentications with other services.
+  # Inactive if password is empty.
   # e.g. LDAP pass-through authentication for HiveServer2 or Impala. Apps can override them individually.
   ## auth_username=hue
   ## auth_password=
@@ -197,6 +205,10 @@
     # e.g. <H2>Test Lab A2 Hue Services</H2>
     ## banner_top_html=
 
+    # Login splash HTML code
+    # e.g. WARNING: You are required to have authorization before you proceed
+    ## login_splash_html=
+
   # Configuration options for user authentication into the web application
   # ------------------------------------------------------------------------
   [[auth]]
@@ -214,6 +226,8 @@
     # - libopenid.backend.OpenIDBackend
     # - liboauth.backend.OAuthBackend
     #     (New oauth, support Twitter, Facebook, Google+ and Linkedin
+    # Multiple Authentication backends are supported by specifying a comma-separated list in order of priority.
+    # However, in order to enable OAuthBackend, it must be the ONLY backend configured.
     ## backend=desktop.auth.backend.AllowFirstUserDjangoBackend
 
     # The service to use when querying PAM.
@@ -716,7 +730,7 @@
     ## validate=true
 
   # Override the default desktop username and password of the hue user used for authentications with other services.
-  # e.g. LDAP/PAM pass-through authentication.
+  # e.g. Used for LDAP/PAM pass-through authentication.
   ## auth_username=hue
   ## auth_password=
 
@@ -765,7 +779,7 @@
     ## validate=true
 
   # Override the desktop default username and password of the hue user used for authentications with other services.
-  # e.g. LDAP/PAM pass-through authentication.
+  # e.g. Used for LDAP/PAM pass-through authentication.
   ## auth_username=hue
   ## auth_password=
 
@@ -1219,4 +1233,3 @@
 
   # Whitelisted domains (only applies to Google OAuth). CSV format.
   ## whitelisted_domains_google=
- 

+ 1 - 1
desktop/libs/notebook/src/notebook/conf.py

@@ -54,7 +54,7 @@ INTERPRETERS = UnspecifiedConfigSection(
         help=_t('Database options to specify the server for connecting.'),
         type=coerce_json_dict,
         default='{}'
-      )                 
+      )
     )
   )
 )

+ 3 - 0
desktop/libs/notebook/src/notebook/connectors/base.py

@@ -143,3 +143,6 @@ class Api(object):
 
   def get_log(self, notebook, snippet, startFrom=None, size=None):
     return 'No logs'
+
+  def autocomplete(self, database=None, table=None, column=None, nested=None):
+    pass