瀏覽代碼

HUE-659. [config] Unite the various *.ini files

Moved the contents of hue-beeswax.ini and hue-shell.ini to hue.ini
bc Wong 13 年之前
父節點
當前提交
eca35421dc

+ 0 - 37
apps/beeswax/conf/hue-beeswax.ini

@@ -1,37 +0,0 @@
-# Configuration options for the Hive UI (Beeswax).
-
-[beeswax]
-
-#
-# Configure the port the internal metastore daemon runs on. Used only if
-# hive.metastore.local is true.
-## beeswax_meta_server_port=8003
-
-#
-# Configure the port the beeswax thrift server runs on
-## beeswax_server_port=8002
-
-#
-# Hive home directory
-## hive_home_dir=/usr/lib/hive
-hive_home_dir=/opt/hadoop/hive
-#
-# Hive configuration directory, where hive-site.xml is located
-## hive_conf_dir=/etc/hive/conf
-hive_conf_dir=/opt/hadoop/hive/conf
-
-
-#
-# Timeout in seconds for thrift calls to beeswax service
-## beeswax_server_conn_timeout=120
-
-#
-# Timeout in seconds for thrift calls to the hive metastore
-## metastore_conn_timeout=10
-
-#
-# Maximum Java heapsize (in megabytes) used by Beeswax Server.
-# Note that the setting of HADOOP_HEAPSIZE in $HADOOP_CONF_DIR/hadoop-env.sh
-# may override this setting.
-## beeswax_server_heapsize=1000
-

+ 0 - 45
apps/shell/conf/hue-shell.ini

@@ -1,45 +0,0 @@
-## Configuration options for the Hue Shell app.
-
-[shell]
-## These are commented out so you know where to put lines like these if necessary.
-
-## The shell_buffer_amount specifies the number of bytes of output per shell
-## that the Shell app will keep in memory. If not specified, it defaults to
-## 524288 (512 MiB).
-#shell_buffer_amount=100
-
-## If you run Hue against a Hadoop cluster with Kerberos security enabled, the
-## Shell app needs to acquire delegation tokens for the subprocesses to work
-## correctly. These delegation tokens are stored as temporary files in some
-## directory. You can configure this directory here. If not specified, it
-## defaults to /tmp/hue_delegation_tokens.
-#shell_delegation_token_dir=/tmp/hue_delegation_tokens
-
-[[ shelltypes ]]
-
-[[[ flume ]]]
-nice_name = "Flume Shell"
-command = "/usr/bin/flume shell"
-help = "The command-line Flume client interface."
-[[[[ environment ]]]]
-## You can specify environment variables for the Flume shell
-## in this section.
-
-[[[ pig ]]]
-nice_name = "Pig Shell (Grunt)"
-command = "/usr/bin/pig -l /dev/null"
-help = "The command-line interpreter for Pig"
-[[[[ environment ]]]]
-## You can specify environment variables for the Pig shell
-## in this section. Note that JAVA_HOME must be configured
-## for the Pig shell to run.
-[[[[[ JAVA_HOME ]]]]]
-value = "/usr/lib/jvm/java-6-sun"
-
-[[[ hbase ]]]
-nice_name = "HBase Shell"
-command = "/usr/bin/hbase shell"
-help = "The command-line HBase client interface."
-[[[[ environment ]]]]
-## You can configure environment variables for the HBase shell
-## in this section.

+ 2 - 2
apps/shell/src/shell/conf.py

@@ -15,8 +15,8 @@
 # limitations under the License.
 """
 Configuration options for the Shell UI.
-This file specifies the structure that hue-shell.ini should follow.
-See conf/hue-shell.ini to configure which shells are available.
+This file specifies the structure that the shell configuration should follow.
+See conf/hue.ini to configure which shells are available.
 """
 from desktop.lib.conf import Config, ConfigSection, UnspecifiedConfigSection
 import shell.utils as utils

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

@@ -222,7 +222,37 @@
 
 
 ###########################################################################
-# Settings to configure Job Designer.
+# Settings to configure Beeswax
+###########################################################################
+
+[beeswax]
+  # Configure the port the internal metastore daemon runs on. Used only if
+  # hive.metastore.local is true.
+  ## beeswax_meta_server_port=8003
+
+  # Configure the port the beeswax thrift server runs on
+  ## beeswax_server_port=8002
+
+  # Hive home directory
+  ## hive_home_dir=/usr/lib/hive
+
+  # Hive configuration directory, where hive-site.xml is located
+  ## hive_conf_dir=/etc/hive/conf
+
+  # Timeout in seconds for thrift calls to beeswax service
+  ## beeswax_server_conn_timeout=120
+
+  # Timeout in seconds for thrift calls to the hive metastore
+  ## metastore_conn_timeout=10
+
+  # Maximum Java heapsize (in megabytes) used by Beeswax Server.
+  # Note that the setting of HADOOP_HEAPSIZE in $HADOOP_CONF_DIR/hadoop-env.sh
+  # may override this setting.
+  ## beeswax_server_heapsize=1000
+
+
+###########################################################################
+# Settings to configure Job Designer
 ###########################################################################
 
 [jobsub]
@@ -233,6 +263,63 @@
   ## security_enabled=false
 
 
+###########################################################################
+# Settings to configure the Shell application
+###########################################################################
+
+[shell]
+  # The shell_buffer_amount specifies the number of bytes of output per shell
+  # that the Shell app will keep in memory. If not specified, it defaults to
+  # 524288 (512 MiB).
+  ## shell_buffer_amount=100
+
+  # If you run Hue against a Hadoop cluster with Kerberos security enabled, the
+  # Shell app needs to acquire delegation tokens for the subprocesses to work
+  # correctly. These delegation tokens are stored as temporary files in some
+  # directory. You can configure this directory here. If not specified, it
+  # defaults to /tmp/hue_delegation_tokens.
+  ## shell_delegation_token_dir=/tmp/hue_delegation_tokens
+
+  [[ shelltypes ]]
+
+    # Define and configure a new shell type "flume"
+    # ------------------------------------------------------------------------
+    [[[ flume ]]]
+      nice_name = "Flume Shell"
+      command = "/usr/bin/flume shell"
+      help = "The command-line Flume client interface."
+
+      [[[[ environment ]]]]
+	# You can specify environment variables for the Flume shell
+	# in this section.
+
+    # Define and configure a new shell type "pig"
+    # ------------------------------------------------------------------------
+    [[[ pig ]]]
+      nice_name = "Pig Shell (Grunt)"
+      command = "/usr/bin/pig -l /dev/null"
+      help = "The command-line interpreter for Pig"
+
+      [[[[ environment ]]]]
+	# You can specify environment variables for the Pig shell
+	# in this section. Note that JAVA_HOME must be configured
+	# for the Pig shell to run.
+
+	[[[[[ JAVA_HOME ]]]]]
+	  value = "/usr/lib/jvm/java-6-sun"
+
+    # Define and configure a new shell type "hbase"
+    # ------------------------------------------------------------------------
+    [[[ hbase ]]]
+      nice_name = "HBase Shell"
+      command = "/usr/bin/hbase shell"
+      help = "The command-line HBase client interface."
+
+      [[[[ environment ]]]]
+	# You can configure environment variables for the HBase shell
+	# in this section.
+
+
 ###########################################################################
 # Settings for the User Admin application
 ###########################################################################

+ 87 - 0
desktop/conf/pseudo-distributed.ini.tmpl

@@ -222,6 +222,36 @@
       ## submit_to=False
 
 
+###########################################################################
+# Settings to configure Beeswax
+###########################################################################
+
+[beeswax]
+  # Configure the port the internal metastore daemon runs on. Used only if
+  # hive.metastore.local is true.
+  ## beeswax_meta_server_port=8003
+
+  # Configure the port the beeswax thrift server runs on
+  ## beeswax_server_port=8002
+
+  # Hive home directory
+  ## hive_home_dir=/usr/lib/hive
+
+  # Hive configuration directory, where hive-site.xml is located
+  ## hive_conf_dir=/etc/hive/conf
+
+  # Timeout in seconds for thrift calls to beeswax service
+  ## beeswax_server_conn_timeout=120
+
+  # Timeout in seconds for thrift calls to the hive metastore
+  ## metastore_conn_timeout=10
+
+  # Maximum Java heapsize (in megabytes) used by Beeswax Server.
+  # Note that the setting of HADOOP_HEAPSIZE in $HADOOP_CONF_DIR/hadoop-env.sh
+  # may override this setting.
+  ## beeswax_server_heapsize=1000
+
+
 ###########################################################################
 # Settings to configure Job Designer.
 ###########################################################################
@@ -234,6 +264,63 @@
   ## security_enabled=false
 
 
+###########################################################################
+# Settings to configure the Shell application
+###########################################################################
+
+[shell]
+  # The shell_buffer_amount specifies the number of bytes of output per shell
+  # that the Shell app will keep in memory. If not specified, it defaults to
+  # 524288 (512 MiB).
+  ## shell_buffer_amount=100
+
+  # If you run Hue against a Hadoop cluster with Kerberos security enabled, the
+  # Shell app needs to acquire delegation tokens for the subprocesses to work
+  # correctly. These delegation tokens are stored as temporary files in some
+  # directory. You can configure this directory here. If not specified, it
+  # defaults to /tmp/hue_delegation_tokens.
+  ## shell_delegation_token_dir=/tmp/hue_delegation_tokens
+
+  [[ shelltypes ]]
+
+    # Define and configure a new shell type "flume"
+    # ------------------------------------------------------------------------
+    [[[ flume ]]]
+      nice_name = "Flume Shell"
+      command = "/usr/bin/flume shell"
+      help = "The command-line Flume client interface."
+
+      [[[[ environment ]]]]
+	# You can specify environment variables for the Flume shell
+	# in this section.
+
+    # Define and configure a new shell type "pig"
+    # ------------------------------------------------------------------------
+    [[[ pig ]]]
+      nice_name = "Pig Shell (Grunt)"
+      command = "/usr/bin/pig -l /dev/null"
+      help = "The command-line interpreter for Pig"
+
+      [[[[ environment ]]]]
+	# You can specify environment variables for the Pig shell
+	# in this section. Note that JAVA_HOME must be configured
+	# for the Pig shell to run.
+
+	[[[[[ JAVA_HOME ]]]]]
+	  value = "/usr/lib/jvm/java-6-sun"
+
+    # Define and configure a new shell type "hbase"
+    # ------------------------------------------------------------------------
+    [[[ hbase ]]]
+      nice_name = "HBase Shell"
+      command = "/usr/bin/hbase shell"
+      help = "The command-line HBase client interface."
+
+      [[[[ environment ]]]]
+	# You can configure environment variables for the HBase shell
+	# in this section.
+
+
 ###########################################################################
 # Settings for the User Admin application
 ###########################################################################

+ 2 - 2
docs/manual.txt

@@ -281,12 +281,12 @@ Having a `hive-site.xml` is optional but often useful, particularly on setting
 up a http://wiki.apache.org/hadoop/Hive/AdminManual/MetastoreAdmin[metastore].
 You may store the `hive-site.xml` in `/etc/hue/conf`, or instruct
 Beeswax to locate it using the `hive_conf_dir` configuration variable.  See
-`/etc/hue/conf/hue-beeswax.ini`.
+`/etc/hue/conf/hue.ini`.
 
 Existing Hive Installation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-In `/etc/hue/conf/hue-beeswax.ini`, modify `hive_conf_dir` to point to the
+In `/etc/hue/conf/hue.ini`, modify `hive_conf_dir` to point to the
 directory containing `hive-site.xml`.