Bläddra i källkod

HUE-3418 [core] Update hierarchy of beeswax/impala conf so that it doesn't get clobbered by SSL configs

Jenny Kim 9 år sedan
förälder
incheckning
c1c518f
2 ändrade filer med 20 tillägg och 20 borttagningar
  1. 10 10
      desktop/conf.dist/hue.ini
  2. 10 10
      desktop/conf/pseudo-distributed.ini.tmpl

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

@@ -816,6 +816,11 @@
   # A comma-separated list of white-listed Hive configuration properties that users are authorized to set.
   # config_whitelist=hive.map.aggr,hive.exec.compress.output,hive.exec.parallel,hive.execution.engine,mapreduce.job.queuename
 
+  # Override the default desktop username and password of the hue user used for authentications with other services.
+  # e.g. Used for LDAP/PAM pass-through authentication.
+  ## auth_username=hue
+  ## auth_password=
+
   [[ssl]]
     # Path to Certificate Authority certificates.
     ## cacerts=/etc/hue/cacerts.pem
@@ -823,11 +828,6 @@
     # Choose whether Hue should validate certificates received from the server.
     ## validate=true
 
-  # Override the default desktop username and password of the hue user used for authentications with other services.
-  # e.g. Used for LDAP/PAM pass-through authentication.
-  ## auth_username=hue
-  ## auth_password=
-
 
 ###########################################################################
 # Settings to configure Impala
@@ -866,6 +866,11 @@
   # (compute or send back results) for that session within QUERY_TIMEOUT_S seconds (default 12hours).
   ## session_timeout_s=43200
 
+  # Override the desktop default username and password of the hue user used for authentications with other services.
+  # e.g. Used for LDAP/PAM pass-through authentication.
+  ## auth_username=hue
+  ## auth_password=
+
   [[ssl]]
     # SSL communication enabled for this server.
     ## enabled=false
@@ -876,11 +881,6 @@
     # Choose whether Hue should validate certificates received from the server.
     ## validate=true
 
-  # Override the desktop default username and password of the hue user used for authentications with other services.
-  # e.g. Used for LDAP/PAM pass-through authentication.
-  ## auth_username=hue
-  ## auth_password=
-
 
 ###########################################################################
 # Settings to configure the Spark application.

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

@@ -818,6 +818,11 @@
   # A comma-separated list of white-listed Hive configuration properties that users are authorized to set.
   # config_whitelist=hive.map.aggr,hive.exec.compress.output,hive.exec.parallel,hive.execution.engine,mapreduce.job.queuename
 
+  # Override the default desktop username and password of the hue user used for authentications with other services.
+  # e.g. Used for LDAP/PAM pass-through authentication.
+  ## auth_username=hue
+  ## auth_password=
+
   [[ssl]]
     # Path to Certificate Authority certificates.
     ## cacerts=/etc/hue/cacerts.pem
@@ -825,11 +830,6 @@
     # Choose whether Hue should validate certificates received from the server.
     ## validate=true
 
-  # Override the default desktop username and password of the hue user used for authentications with other services.
-  # e.g. Used for LDAP/PAM pass-through authentication.
-  ## auth_username=hue
-  ## auth_password=
-
 
 ###########################################################################
 # Settings to configure Impala
@@ -868,6 +868,11 @@
   # (compute or send back results) for that session within QUERY_TIMEOUT_S seconds (default 12hours).
   ## session_timeout_s=43200
 
+  # Override the desktop default username and password of the hue user used for authentications with other services.
+  # e.g. Used for LDAP/PAM pass-through authentication.
+  ## auth_username=hue
+  ## auth_password=
+
   [[ssl]]
     # SSL communication enabled for this server.
     ## enabled=false
@@ -878,11 +883,6 @@
     # Choose whether Hue should validate certificates received from the server.
     ## validate=true
 
-  # Override the desktop default username and password of the hue user used for authentications with other services.
-  # e.g. Used for LDAP/PAM pass-through authentication.
-  ## auth_username=hue
-  ## auth_password=
-
 
 ###########################################################################
 # Settings to configure the Spark application.