Browse Source

[desktop] Synchronize hue.ini and pseudo-distributed.ini.tmpl

This unifies most of the two files, other than some debug settings.
Erick Tryzelaar 10 years ago
parent
commit
9953d07b44
2 changed files with 36 additions and 30 deletions
  1. 18 17
      desktop/conf.dist/hue.ini
  2. 18 13
      desktop/conf/pseudo-distributed.ini.tmpl

+ 18 - 17
desktop/conf.dist/hue.ini

@@ -89,7 +89,7 @@
   # Help improve Hue with anonymous usage analytics.
   # Use Google Analytics to see how many times an application or specific section of an application is used, nothing more.
   ## collect_usage=true
-  
+
   # Support for HTTPS termination at the load-balancer level with SECURE_PROXY_SSL_HEADER.
   ## secure_proxy_ssl_header=false
 
@@ -196,7 +196,7 @@
     # - libsaml.backend.SAML2Backend
     # - libopenid.backend.OpenIDBackend
     # - liboauth.backend.OAuthBackend
-    #     (Support Twitter, Facebook, Google+ and Linkedin
+    #     (New oauth, support Twitter, Facebook, Google+ and Linkedin
     ## backend=desktop.auth.backend.AllowFirstUserDjangoBackend
 
     # The service to use when querying PAM.
@@ -314,7 +314,7 @@
 
       # The attribute of the group object which identifies the members of the group
       ## group_member_attr=members
-    
+
     [[[ldap_servers]]]
 
       ## [[[[mycompany]]]]
@@ -437,7 +437,7 @@
     ## kinit_path=/path/to/kinit
 
 
-  # Configuration options for using OAuthBackend (core) login
+  # Configuration options for using OAuthBackend (Core) login
   # ------------------------------------------------------------------------
   [[oauth]]
     # The Consumer key of the application
@@ -497,7 +497,7 @@
   # Have Hue initiated logout requests be signed and provide a certificate.
   ## logout_requests_signed=false
 
-  ## Username can be sourced from 'attributes' or 'nameid'.
+  # Username can be sourced from 'attributes' or 'nameid'.
   ## username_source=attributes
 
   # Performs the logout or not.
@@ -505,11 +505,11 @@
 
 
 ###########################################################################
-# Settings to configure OPENID
+# Settings to configure OpenID
 ###########################################################################
 
 [libopenid]
-  # (Required) OpenId SSO endpoint url. 
+  # (Required) OpenId SSO endpoint url.
   ## server_endpoint_url=https://www.google.com/accounts/o8/id
 
   # OpenId 1.1 identity url prefix to be used instead of SSO endpoint url
@@ -528,8 +528,8 @@
 ###########################################################################
 
 [liboauth]
-  # NOTE: 
-  # To work, each of the active (i.e. uncommented) service must have 
+  # NOTE:
+  # To work, each of the active (i.e. uncommented) service must have
   # applications created on the social network.
   # Then the "consumer key" and "consumer secret" must be provided here.
   #
@@ -544,17 +544,17 @@
   # Google+ : CONSENT SCREEN must have email address
   # Facebook: Sandbox Mode must be DISABLED
   # Linkedin: "In OAuth User Agreement", r_emailaddress is REQUIRED
-  
+
   # The Consumer key of the application
-  ## consumer_key_twitter=              
-  ## consumer_key_google=               
-  ## consumer_key_facebook=             
+  ## consumer_key_twitter=
+  ## consumer_key_google=
+  ## consumer_key_facebook=
   ## consumer_key_linkedin=
 
   # The Consumer secret of the application
-  ## consumer_secret_twitter=           
-  ## consumer_secret_google=            
-  ## consumer_secret_facebook=          
+  ## consumer_secret_twitter=
+  ## consumer_secret_google=
+  ## consumer_secret_facebook=
   ## consumer_secret_linkedin=
 
   # The Request token URL
@@ -707,7 +707,7 @@
       # URL of the HistoryServer API
       ## history_server_api_url=http://localhost:19888
 
-      # In secure mode (HTTPS), if SSL certificates from from YARN Rest APIs
+      # In secure mode (HTTPS), if SSL certificates from YARN Rest APIs
       # have to be verified against certificate authority
       ## ssl_cert_ca_verify=True
 
@@ -1047,6 +1047,7 @@
     ## pwd_hint="The password must be at least 8 characters long, and must contain both uppercase and lowercase letters, at least one number, and at least one special character."
     ## pwd_error_message="The password must be at least 8 characters long, and must contain both uppercase and lowercase letters, at least one number, and at least one special character."
 
+
 ###########################################################################
 # Settings for the Sentry lib
 ###########################################################################

+ 18 - 13
desktop/conf/pseudo-distributed.ini.tmpl

@@ -6,12 +6,12 @@
 # ===================================
 #
 # For complete documentation about the contents of this file, run
-#       $ <hue_root>/build/env/bin/hue config_help
+#   $ <hue_root>/build/env/bin/hue config_help
 #
 # All .ini files under the current directory are treated equally.  Their
 # contents are merged to form the Hue configuration, which can
 # can be viewed on the Hue at
-#       http://<hue_host>:<port>/dump_config
+#   http://<hue_host>:<port>/dump_config
 
 
 ###########################################################################
@@ -33,7 +33,7 @@
   # Time zone name
   time_zone=America/Los_Angeles
 
-  # Enable or disable Django debug mode
+  # Enable or disable Django debug mode.
   ## django_debug_mode=true
 
   # Enable or disable database debug mode.
@@ -165,12 +165,12 @@
   #     }
   #   ]
   # }
+  ## log_redaction_file=
 
   # Comma separated list of strings representing the host/domain names that the Hue server can serve.
   # e.g.: localhost,domain1,*
   ## allowed_hosts=*
 
-#poll_enabled=false
 
   # Administrators
   # ----------------
@@ -183,8 +183,9 @@
   # -------------------
   [[custom]]
 
-  # Top banner HTML code
-  ## banner_top_html=
+    # Top banner HTML code
+    # e.g. <H2>Test Lab A2 Hue Services</H2>
+    ## banner_top_html=
 
   # Configuration options for user authentication into the web application
   # ------------------------------------------------------------------------
@@ -218,6 +219,9 @@
     # Defaults to HTTP_REMOTE_USER
     ## remote_user_header=HTTP_REMOTE_USER
 
+    # Synchronize a users groups when they login
+    ## sync_groups_on_login=false
+
     # Ignore the case of usernames when searching for existing users.
     # Only supported in remoteUserDjangoBackend.
     ## ignore_username_case=true
@@ -271,9 +275,6 @@
     # For use when using LdapBackend for Hue authentication
     ## create_users_on_login = true
 
-    # Synchronize a users groups when they login
-    ## sync_groups_on_login=false
-
     # Ignore the case of usernames when searching for existing users in Hue.
     ## ignore_username_case=false
 
@@ -315,9 +316,12 @@
       # Base filter for searching for groups
       ## group_filter="objectclass=*"
 
-      # The username attribute in the LDAP schema
+      # The group name attribute in the LDAP schema
       ## group_name_attr=cn
 
+      # The attribute of the group object which identifies the members of the group
+      ## group_member_attr=members
+
     [[[ldap_servers]]]
 
       ## [[[[mycompany]]]]
@@ -381,7 +385,7 @@
     # Database engine is typically one of:
     # postgresql_psycopg2, mysql, sqlite3 or oracle.
     #
-    # Note that for sqlite3, 'name', below is a a path to the filename. For other backends, it is the database name.
+    # Note that for sqlite3, 'name', below is a path to the filename. For other backends, it is the database name.
     # Note for Oracle, options={'threaded':true} must be set in order to avoid crashes.
     # Note for Oracle, you can use the Oracle Service Name by setting "port=0" and then "name=<host>:<port>/<service_name>".
     ## engine=sqlite3
@@ -508,7 +512,7 @@
 
 
 ###########################################################################
-# Settings to configure OpenId
+# Settings to configure OpenID
 ###########################################################################
 
 [libopenid]
@@ -834,6 +838,7 @@
   ## close_queries=false
 
   # Thrift version to use when communicating with HiveServer2.
+  # New column format is from version 7.
   ## thrift_version=7
 
   [[ssl]]
@@ -991,7 +996,7 @@
 
 
 ###########################################################################
-# Settings to configure Job Browser
+# Settings to configure Job Browser.
 ###########################################################################
 
 [jobbrowser]