You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by lm...@apache.org on 2015/05/06 21:15:01 UTC

svn commit: r1678065 - in /knox: site/ site/books/knox-0-6-0/ trunk/books/0.6.0/ trunk/src/site/

Author: lmccay
Date: Wed May  6 19:15:01 2015
New Revision: 1678065

URL: http://svn.apache.org/r1678065
Log:
corrected the secure clusters section and published links for release 0.6.0

Modified:
    knox/site/books/knox-0-6-0/user-guide.html
    knox/site/index.html
    knox/site/issue-tracking.html
    knox/site/license.html
    knox/site/mail-lists.html
    knox/site/project-info.html
    knox/site/team-list.html
    knox/trunk/books/0.6.0/config.md
    knox/trunk/books/0.6.0/config_kerberos.md
    knox/trunk/src/site/site.xml

Modified: knox/site/books/knox-0-6-0/user-guide.html
URL: http://svn.apache.org/viewvc/knox/site/books/knox-0-6-0/user-guide.html?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/site/books/knox-0-6-0/user-guide.html (original)
+++ knox/site/books/knox-0-6-0/user-guide.html Wed May  6 19:15:01 2015
@@ -354,7 +354,57 @@ https://{gateway-host}:{gateway-port}/{g
     <li>Gateway: jdbc:hive2://{gateway-host}:{gateway-port}/;ssl=true;sslTrustStore={gateway-trust-store-path};trustStorePassword={gateway-trust-store-password}?hive.server2.transport.mode=http;hive.server2.thrift.http.path={gateway-path}/{cluster-name}/hive</li>
     <li>Cluster: <code>http://{hive-host}:10001/cliservice</code></li>
   </ul></li>
-</ul><p>The values for <code>{gateway-host}</code>, <code>{gateway-port}</code>, <code>{gateway-path}</code> are provided via the gateway configuration file (i.e. <code>{GATEWAY_HOME}/conf/gateway-site.xml</code>).</p><p>The value for <code>{cluster-name}</code> is derived from the file name of the cluster topology descriptor (e.g. <code>{GATEWAY_HOME}/deployments/{cluster-name}.xml</code>).</p><p>The value for <code>{webhdfs-host}</code>, <code>{webhcat-host}</code>, <code>{oozie-host}</code>, <code>{hbase-host}</code> and <code>{hive-host}</code> are provided via the cluster topology descriptor (e.g. <code>{GATEWAY_HOME}/conf/topologies/{cluster-name}.xml</code>).</p><p>Note: The ports 50070, 50111, 11000, 60080 (default 8080) and 10001 are the defaults for WebHDFS, WebHCat, Oozie, Stargate/HBase and Hive respectively. Their values can also be provided via the cluster topology descriptor if your Hadoop cluster uses different ports.</p><h3><a id="Configuration"></a>Configuration</h
 3><h4><a id="Topology+Descriptors"></a>Topology Descriptors</h4><p>The topology descriptor files provide the gateway with per-cluster configuration information. This includes configuration for both the providers within the gateway and the services within the Hadoop cluster. These files are located in <code>{GATEWAY_HOME}/conf/topologies</code>. The general outline of this document looks like this.</p>
+</ul><p>The values for <code>{gateway-host}</code>, <code>{gateway-port}</code>, <code>{gateway-path}</code> are provided via the gateway configuration file (i.e. <code>{GATEWAY_HOME}/conf/gateway-site.xml</code>).</p><p>The value for <code>{cluster-name}</code> is derived from the file name of the cluster topology descriptor (e.g. <code>{GATEWAY_HOME}/deployments/{cluster-name}.xml</code>).</p><p>The value for <code>{webhdfs-host}</code>, <code>{webhcat-host}</code>, <code>{oozie-host}</code>, <code>{hbase-host}</code> and <code>{hive-host}</code> are provided via the cluster topology descriptor (e.g. <code>{GATEWAY_HOME}/conf/topologies/{cluster-name}.xml</code>).</p><p>Note: The ports 50070, 50111, 11000, 60080 (default 8080) and 10001 are the defaults for WebHDFS, WebHCat, Oozie, Stargate/HBase and Hive respectively. Their values can also be provided via the cluster topology descriptor if your Hadoop cluster uses different ports.</p><h3><a id="Configuration"></a>Configuration</h
 3><h3><a id="Related+Cluster+Configuration"></a>Related Cluster Configuration</h3><p>The following configuration changes must be made to your cluster to allow Apache Knox to dispatch requests to the various service components on behalf of end users.</p><h4><a id="Grant+Proxy+privileges+for+Knox+user+in+`core-site.xml`+on+Hadoop+master+nodes"></a>Grant Proxy privileges for Knox user in <code>core-site.xml</code> on Hadoop master nodes</h4><p>Update <code>core-site.xml</code> and add the following lines towards the end of the file.</p><p>Replace FQDN_OF_KNOX_HOST with the fully qualified domain name of the host running the gateway. You can usually find this by running <code>hostname -f</code> on that host.</p><p>You could use * for local developer testing if Knox host does not have static IP.</p>
+<pre><code>&lt;property&gt;
+    &lt;name&gt;hadoop.proxyuser.knox.groups&lt;/name&gt;
+    &lt;value&gt;users&lt;/value&gt;
+&lt;/property&gt;
+&lt;property&gt;
+    &lt;name&gt;hadoop.proxyuser.knox.hosts&lt;/name&gt;
+    &lt;value&gt;FQDN_OF_KNOX_HOST&lt;/value&gt;
+&lt;/property&gt;
+</code></pre><h4><a id="Grant+proxy+privilege+for+Knox+in+`webhcat-site.xml`+on+Hadoop+master+nodes"></a>Grant proxy privilege for Knox in <code>webhcat-site.xml</code> on Hadoop master nodes</h4><p>Update <code>webhcat-site.xml</code> and add the following lines towards the end of the file.</p><p>Replace FQDN_OF_KNOX_HOST with right value in your cluster. You could use * for local developer testing if Knox host does not have static IP.</p>
+<pre><code>&lt;property&gt;
+    &lt;name&gt;webhcat.proxyuser.knox.groups&lt;/name&gt;
+    &lt;value&gt;users&lt;/value&gt;
+&lt;/property&gt;
+&lt;property&gt;
+    &lt;name&gt;webhcat.proxyuser.knox.hosts&lt;/name&gt;
+    &lt;value&gt;FQDN_OF_KNOX_HOST&lt;/value&gt;
+&lt;/property&gt;
+</code></pre><h4><a id="Grant+proxy+privilege+for+Knox+in+`oozie-site.xml`+on+Oozie+host"></a>Grant proxy privilege for Knox in <code>oozie-site.xml</code> on Oozie host</h4><p>Update <code>oozie-site.xml</code> and add the following lines towards the end of the file.</p><p>Replace FQDN_OF_KNOX_HOST with right value in your cluster. You could use * for local developer testing if Knox host does not have static IP.</p>
+<pre><code>&lt;property&gt;
+   &lt;name&gt;oozie.service.ProxyUserService.proxyuser.knox.groups&lt;/name&gt;
+   &lt;value&gt;users&lt;/value&gt;
+&lt;/property&gt;
+&lt;property&gt;
+   &lt;name&gt;oozie.service.ProxyUserService.proxyuser.knox.hosts&lt;/name&gt;
+   &lt;value&gt;FQDN_OF_KNOX_HOST&lt;/value&gt;
+&lt;/property&gt;
+</code></pre><h4><a id="Enable+http+transport+mode+and+use+substitution+in+Hive+Server2"></a>Enable http transport mode and use substitution in Hive Server2</h4><p>Update <code>hive-site.xml</code> and set the following properties on Hive Server2 hosts. Some of the properties may already be in the hive-site.xml. Ensure that the values match the ones below.</p>
+<pre><code>&lt;property&gt;
+  &lt;name&gt;hive.server2.allow.user.substitution&lt;/name&gt;
+  &lt;value&gt;true&lt;/value&gt;
+&lt;/property&gt;
+
+&lt;property&gt;
+    &lt;name&gt;hive.server2.transport.mode&lt;/name&gt;
+    &lt;value&gt;http&lt;/value&gt;
+    &lt;description&gt;Server transport mode. &quot;binary&quot; or &quot;http&quot;.&lt;/description&gt;
+&lt;/property&gt;
+
+&lt;property&gt;
+    &lt;name&gt;hive.server2.thrift.http.port&lt;/name&gt;
+    &lt;value&gt;10001&lt;/value&gt;
+    &lt;description&gt;Port number when in HTTP mode.&lt;/description&gt;
+&lt;/property&gt;
+
+&lt;property&gt;
+    &lt;name&gt;hive.server2.thrift.http.path&lt;/name&gt;
+    &lt;value&gt;cliservice&lt;/value&gt;
+    &lt;description&gt;Path component of URL endpoint when in HTTP mode.&lt;/description&gt;
+&lt;/property&gt;
+</code></pre><h4><a id="Topology+Descriptors"></a>Topology Descriptors</h4><p>The topology descriptor files provide the gateway with per-cluster configuration information. This includes configuration for both the providers within the gateway and the services within the Hadoop cluster. These files are located in <code>{GATEWAY_HOME}/conf/topologies</code>. The general outline of this document looks like this.</p>
 <pre><code>&lt;topology&gt;
     &lt;gateway&gt;
         &lt;provider&gt;
@@ -1475,34 +1525,7 @@ add_principal -randkey knox/knox@EXAMPLE
 ktadd -norandkey -k /etc/security/keytabs/knox.service.keytab
 ktadd -k /etc/security/keytabs/knox.service.keytab -norandkey knox/knox@EXAMPLE.COM
 exit
-</code></pre><h4><a id="Grant+Proxy+privileges+for+Knox+user+in+`core-site.xml`+on+Hadoop+master+nodes"></a>Grant Proxy privileges for Knox user in <code>core-site.xml</code> on Hadoop master nodes</h4><p>Update <code>core-site.xml</code> and add the following lines towards the end of the file.</p><p>Replace FQDN_OF_KNOX_HOST with the fully qualified domain name of the host running the gateway. You can usually find this by running <code>hostname -f</code> on that host.</p><p>You could use * for local developer testing if Knox host does not have static IP.</p>
-<pre><code>&lt;property&gt;
-    &lt;name&gt;hadoop.proxyuser.knox.groups&lt;/name&gt;
-    &lt;value&gt;users&lt;/value&gt;
-&lt;/property&gt;
-&lt;property&gt;
-    &lt;name&gt;hadoop.proxyuser.knox.hosts&lt;/name&gt;
-    &lt;value&gt;FQDN_OF_KNOX_HOST&lt;/value&gt;
-&lt;/property&gt;
-</code></pre><h4><a id="Grant+proxy+privilege+for+Knox+in+`webhcat-site.xml`+on+Hadoop+master+nodes"></a>Grant proxy privilege for Knox in <code>webhcat-site.xml</code> on Hadoop master nodes</h4><p>Update <code>webhcat-site.xml</code> and add the following lines towards the end of the file.</p><p>Replace FQDN_OF_KNOX_HOST with right value in your cluster. You could use * for local developer testing if Knox host does not have static IP.</p>
-<pre><code>&lt;property&gt;
-    &lt;name&gt;webhcat.proxyuser.knox.groups&lt;/name&gt;
-    &lt;value&gt;users&lt;/value&gt;
-&lt;/property&gt;
-&lt;property&gt;
-    &lt;name&gt;webhcat.proxyuser.knox.hosts&lt;/name&gt;
-    &lt;value&gt;FQDN_OF_KNOX_HOST&lt;/value&gt;
-&lt;/property&gt;
-</code></pre><h4><a id="Grant+proxy+privilege+for+Knox+in+`oozie-site.xml`+on+Oozie+host"></a>Grant proxy privilege for Knox in <code>oozie-site.xml</code> on Oozie host</h4><p>Update <code>oozie-site.xml</code> and add the following lines towards the end of the file.</p><p>Replace FQDN_OF_KNOX_HOST with right value in your cluster. You could use * for local developer testing if Knox host does not have static IP.</p>
-<pre><code>&lt;property&gt;
-   &lt;name&gt;oozie.service.ProxyUserService.proxyuser.knox.groups&lt;/name&gt;
-   &lt;value&gt;users&lt;/value&gt;
-&lt;/property&gt;
-&lt;property&gt;
-   &lt;name&gt;oozie.service.ProxyUserService.proxyuser.knox.hosts&lt;/name&gt;
-   &lt;value&gt;FQDN_OF_KNOX_HOST&lt;/value&gt;
-&lt;/property&gt;
-</code></pre><h4><a id="Enable+http+transport+mode+and+use+substitution+in+Hive+Server2"></a>Enable http transport mode and use substitution in Hive Server2</h4><p>Update <code>hive-site.xml</code> and set the following properties on Hive Server2 hosts. Some of the properties may already be in the hive-site.xml. Ensure that the values match the ones below.</p><p><property>  <name>hive.server2.allow.user.substitution</name>  <value>true</value> </property></p><p><property>  <name>hive.server2.transport.mode</name>  <value>http</value>  <description>Server transport mode. &ldquo;binary&rdquo; or &ldquo;http&rdquo;.</description> </property></p><p><property>  <name>hive.server2.thrift.http.port</name>  <value>10001</value>  <description>Port number when in HTTP mode.</description> </property></p><p><property>  <name>hive.server2.thrift.http.path</name>  <value>cliservice</value>  <description>Path component of URL endpoint when in HTTP mode.</description> </property></p><h4><a id="Copy
 +knox+keytab+to+Knox+host"></a>Copy knox keytab to Knox host</h4><p>Add unix account for the knox user on Knox host</p>
+</code></pre><h4><a id="Copy+knox+keytab+to+Knox+host"></a>Copy knox keytab to Knox host</h4><p>Add unix account for the knox user on Knox host</p>
 <pre><code>useradd -g hadoop knox
 </code></pre><p>Copy knox.service.keytab created on KDC host on to your Knox host /etc/knox/conf/knox.service.keytab</p>
 <pre><code>chown knox knox.service.keytab

Modified: knox/site/index.html
URL: http://svn.apache.org/viewvc/knox/site/index.html?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/site/index.html (original)
+++ knox/site/index.html Wed May  6 19:15:01 2015
@@ -83,13 +83,13 @@
                        <h5>Documentation</h5>
                   <ul>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html" title="User's Guide">User's Guide</a>
+                          <a href="books/knox-0-6-0/user-guide.html" title="User's Guide">User's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
+                          <a href="books/knox-0-6-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html#Quick+Start" title="Quick Start">Quick Start</a>
+                          <a href="books/knox-0-6-0/user-guide.html#Quick+Start" title="Quick Start">Quick Start</a>
             </li>
                   <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Dependencies" class="externalLink" title="Dependencies">Dependencies</a>
@@ -101,6 +101,9 @@
                        <h5>Releases</h5>
                   <ul>
                   <li class="none">
+                          <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.6.0" class="externalLink" title="0.6.0">0.6.0</a>
+            </li>
+                  <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.5.1" class="externalLink" title="0.5.1">0.5.1</a>
             </li>
                   <li class="none">

Modified: knox/site/issue-tracking.html
URL: http://svn.apache.org/viewvc/knox/site/issue-tracking.html?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/site/issue-tracking.html (original)
+++ knox/site/issue-tracking.html Wed May  6 19:15:01 2015
@@ -83,13 +83,13 @@
                        <h5>Documentation</h5>
                   <ul>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html" title="User's Guide">User's Guide</a>
+                          <a href="books/knox-0-6-0/user-guide.html" title="User's Guide">User's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
+                          <a href="books/knox-0-6-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html#Quick+Start" title="Quick Start">Quick Start</a>
+                          <a href="books/knox-0-6-0/user-guide.html#Quick+Start" title="Quick Start">Quick Start</a>
             </li>
                   <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Dependencies" class="externalLink" title="Dependencies">Dependencies</a>
@@ -101,6 +101,9 @@
                        <h5>Releases</h5>
                   <ul>
                   <li class="none">
+                          <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.6.0" class="externalLink" title="0.6.0">0.6.0</a>
+            </li>
+                  <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.5.1" class="externalLink" title="0.5.1">0.5.1</a>
             </li>
                   <li class="none">

Modified: knox/site/license.html
URL: http://svn.apache.org/viewvc/knox/site/license.html?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/site/license.html (original)
+++ knox/site/license.html Wed May  6 19:15:01 2015
@@ -83,13 +83,13 @@
                        <h5>Documentation</h5>
                   <ul>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html" title="User's Guide">User's Guide</a>
+                          <a href="books/knox-0-6-0/user-guide.html" title="User's Guide">User's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
+                          <a href="books/knox-0-6-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html#Quick+Start" title="Quick Start">Quick Start</a>
+                          <a href="books/knox-0-6-0/user-guide.html#Quick+Start" title="Quick Start">Quick Start</a>
             </li>
                   <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Dependencies" class="externalLink" title="Dependencies">Dependencies</a>
@@ -101,6 +101,9 @@
                        <h5>Releases</h5>
                   <ul>
                   <li class="none">
+                          <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.6.0" class="externalLink" title="0.6.0">0.6.0</a>
+            </li>
+                  <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.5.1" class="externalLink" title="0.5.1">0.5.1</a>
             </li>
                   <li class="none">

Modified: knox/site/mail-lists.html
URL: http://svn.apache.org/viewvc/knox/site/mail-lists.html?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/site/mail-lists.html (original)
+++ knox/site/mail-lists.html Wed May  6 19:15:01 2015
@@ -83,13 +83,13 @@
                        <h5>Documentation</h5>
                   <ul>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html" title="User's Guide">User's Guide</a>
+                          <a href="books/knox-0-6-0/user-guide.html" title="User's Guide">User's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
+                          <a href="books/knox-0-6-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html#Quick+Start" title="Quick Start">Quick Start</a>
+                          <a href="books/knox-0-6-0/user-guide.html#Quick+Start" title="Quick Start">Quick Start</a>
             </li>
                   <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Dependencies" class="externalLink" title="Dependencies">Dependencies</a>
@@ -101,6 +101,9 @@
                        <h5>Releases</h5>
                   <ul>
                   <li class="none">
+                          <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.6.0" class="externalLink" title="0.6.0">0.6.0</a>
+            </li>
+                  <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.5.1" class="externalLink" title="0.5.1">0.5.1</a>
             </li>
                   <li class="none">

Modified: knox/site/project-info.html
URL: http://svn.apache.org/viewvc/knox/site/project-info.html?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/site/project-info.html (original)
+++ knox/site/project-info.html Wed May  6 19:15:01 2015
@@ -83,13 +83,13 @@
                        <h5>Documentation</h5>
                   <ul>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html" title="User's Guide">User's Guide</a>
+                          <a href="books/knox-0-6-0/user-guide.html" title="User's Guide">User's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
+                          <a href="books/knox-0-6-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html#Quick+Start" title="Quick Start">Quick Start</a>
+                          <a href="books/knox-0-6-0/user-guide.html#Quick+Start" title="Quick Start">Quick Start</a>
             </li>
                   <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Dependencies" class="externalLink" title="Dependencies">Dependencies</a>
@@ -101,6 +101,9 @@
                        <h5>Releases</h5>
                   <ul>
                   <li class="none">
+                          <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.6.0" class="externalLink" title="0.6.0">0.6.0</a>
+            </li>
+                  <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.5.1" class="externalLink" title="0.5.1">0.5.1</a>
             </li>
                   <li class="none">

Modified: knox/site/team-list.html
URL: http://svn.apache.org/viewvc/knox/site/team-list.html?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/site/team-list.html (original)
+++ knox/site/team-list.html Wed May  6 19:15:01 2015
@@ -83,13 +83,13 @@
                        <h5>Documentation</h5>
                   <ul>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html" title="User's Guide">User's Guide</a>
+                          <a href="books/knox-0-6-0/user-guide.html" title="User's Guide">User's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
+                          <a href="books/knox-0-6-0/dev-guide.html" title="Developer's Guide">Developer's Guide</a>
             </li>
                   <li class="none">
-                          <a href="books/knox-0-5-0/knox-0-5-0.html#Quick+Start" title="Quick Start">Quick Start</a>
+                          <a href="books/knox-0-6-0/user-guide.html#Quick+Start" title="Quick Start">Quick Start</a>
             </li>
                   <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Dependencies" class="externalLink" title="Dependencies">Dependencies</a>
@@ -101,6 +101,9 @@
                        <h5>Releases</h5>
                   <ul>
                   <li class="none">
+                          <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.6.0" class="externalLink" title="0.6.0">0.6.0</a>
+            </li>
+                  <li class="none">
                           <a href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.5.1" class="externalLink" title="0.5.1">0.5.1</a>
             </li>
                   <li class="none">

Modified: knox/trunk/books/0.6.0/config.md
URL: http://svn.apache.org/viewvc/knox/trunk/books/0.6.0/config.md?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/trunk/books/0.6.0/config.md (original)
+++ knox/trunk/books/0.6.0/config.md Wed May  6 19:15:01 2015
@@ -17,6 +17,90 @@
 
 ### Configuration ###
 
+### Related Cluster Configuration ###
+
+The following configuration changes must be made to your cluster to allow Apache Knox to
+dispatch requests to the various service components on behalf of end users.
+
+#### Grant Proxy privileges for Knox user in `core-site.xml` on Hadoop master nodes ####
+
+Update `core-site.xml` and add the following lines towards the end of the file.
+
+Replace FQDN_OF_KNOX_HOST with the fully qualified domain name of the host running the gateway.
+You can usually find this by running `hostname -f` on that host.
+
+You could use * for local developer testing if Knox host does not have static IP.
+
+    <property>
+        <name>hadoop.proxyuser.knox.groups</name>
+        <value>users</value>
+    </property>
+    <property>
+        <name>hadoop.proxyuser.knox.hosts</name>
+        <value>FQDN_OF_KNOX_HOST</value>
+    </property>
+
+#### Grant proxy privilege for Knox in `webhcat-site.xml` on Hadoop master nodes ####
+
+Update `webhcat-site.xml` and add the following lines towards the end of the file.
+
+Replace FQDN_OF_KNOX_HOST with right value in your cluster.
+You could use * for local developer testing if Knox host does not have static IP.
+
+    <property>
+        <name>webhcat.proxyuser.knox.groups</name>
+        <value>users</value>
+    </property>
+    <property>
+        <name>webhcat.proxyuser.knox.hosts</name>
+        <value>FQDN_OF_KNOX_HOST</value>
+    </property>
+
+#### Grant proxy privilege for Knox in `oozie-site.xml` on Oozie host ####
+
+Update `oozie-site.xml` and add the following lines towards the end of the file.
+
+Replace FQDN_OF_KNOX_HOST with right value in your cluster.
+You could use * for local developer testing if Knox host does not have static IP.
+
+    <property>
+       <name>oozie.service.ProxyUserService.proxyuser.knox.groups</name>
+       <value>users</value>
+    </property>
+    <property>
+       <name>oozie.service.ProxyUserService.proxyuser.knox.hosts</name>
+       <value>FQDN_OF_KNOX_HOST</value>
+    </property>
+
+#### Enable http transport mode and use substitution in Hive Server2 ####
+
+Update `hive-site.xml` and set the following properties on Hive Server2 hosts.
+Some of the properties may already be in the hive-site.xml. 
+Ensure that the values match the ones below.
+
+    <property>
+      <name>hive.server2.allow.user.substitution</name>
+      <value>true</value>
+    </property>
+
+    <property>
+	    <name>hive.server2.transport.mode</name>
+	    <value>http</value>
+	    <description>Server transport mode. "binary" or "http".</description>
+    </property>
+
+    <property>
+	    <name>hive.server2.thrift.http.port</name>
+	    <value>10001</value>
+	    <description>Port number when in HTTP mode.</description>
+    </property>
+
+    <property>
+	    <name>hive.server2.thrift.http.path</name>
+	    <value>cliservice</value>
+	    <description>Path component of URL endpoint when in HTTP mode.</description>
+    </property>
+
 #### Topology Descriptors ####
 
 The topology descriptor files provide the gateway with per-cluster configuration information.

Modified: knox/trunk/books/0.6.0/config_kerberos.md
URL: http://svn.apache.org/viewvc/knox/trunk/books/0.6.0/config_kerberos.md?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/trunk/books/0.6.0/config_kerberos.md (original)
+++ knox/trunk/books/0.6.0/config_kerberos.md Wed May  6 19:15:01 2015
@@ -40,85 +40,6 @@ ssh into your host running KDC
     ktadd -k /etc/security/keytabs/knox.service.keytab -norandkey knox/knox@EXAMPLE.COM
     exit
 
-#### Grant Proxy privileges for Knox user in `core-site.xml` on Hadoop master nodes ####
-
-Update `core-site.xml` and add the following lines towards the end of the file.
-
-Replace FQDN_OF_KNOX_HOST with the fully qualified domain name of the host running the gateway.
-You can usually find this by running `hostname -f` on that host.
-
-You could use * for local developer testing if Knox host does not have static IP.
-
-    <property>
-        <name>hadoop.proxyuser.knox.groups</name>
-        <value>users</value>
-    </property>
-    <property>
-        <name>hadoop.proxyuser.knox.hosts</name>
-        <value>FQDN_OF_KNOX_HOST</value>
-    </property>
-
-#### Grant proxy privilege for Knox in `webhcat-site.xml` on Hadoop master nodes ####
-
-Update `webhcat-site.xml` and add the following lines towards the end of the file.
-
-Replace FQDN_OF_KNOX_HOST with right value in your cluster.
-You could use * for local developer testing if Knox host does not have static IP.
-
-    <property>
-        <name>webhcat.proxyuser.knox.groups</name>
-        <value>users</value>
-    </property>
-    <property>
-        <name>webhcat.proxyuser.knox.hosts</name>
-        <value>FQDN_OF_KNOX_HOST</value>
-    </property>
-
-#### Grant proxy privilege for Knox in `oozie-site.xml` on Oozie host ####
-
-Update `oozie-site.xml` and add the following lines towards the end of the file.
-
-Replace FQDN_OF_KNOX_HOST with right value in your cluster.
-You could use * for local developer testing if Knox host does not have static IP.
-
-    <property>
-       <name>oozie.service.ProxyUserService.proxyuser.knox.groups</name>
-       <value>users</value>
-    </property>
-    <property>
-       <name>oozie.service.ProxyUserService.proxyuser.knox.hosts</name>
-       <value>FQDN_OF_KNOX_HOST</value>
-    </property>
-
-#### Enable http transport mode and use substitution in Hive Server2 ####
-
-Update `hive-site.xml` and set the following properties on Hive Server2 hosts.
-Some of the properties may already be in the hive-site.xml. 
-Ensure that the values match the ones below.
-
-<property>
-  <name>hive.server2.allow.user.substitution</name>
-  <value>true</value>
-</property>
-
-<property>
-	<name>hive.server2.transport.mode</name>
-	<value>http</value>
-	<description>Server transport mode. "binary" or "http".</description>
-</property>
-
-<property>
-	<name>hive.server2.thrift.http.port</name>
-	<value>10001</value>
-	<description>Port number when in HTTP mode.</description>
-</property>
-
-<property>
-	<name>hive.server2.thrift.http.path</name>
-	<value>cliservice</value>
-	<description>Path component of URL endpoint when in HTTP mode.</description>
-</property>
-
 
 #### Copy knox keytab to Knox host ####
 

Modified: knox/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/knox/trunk/src/site/site.xml?rev=1678065&r1=1678064&r2=1678065&view=diff
==============================================================================
--- knox/trunk/src/site/site.xml (original)
+++ knox/trunk/src/site/site.xml Wed May  6 19:15:01 2015
@@ -92,14 +92,15 @@
         </menu>
 
         <menu name="Documentation">
-            <item name="User's Guide" href="http://knox.apache.org/books/knox-0-5-0/knox-0-5-0.html"/>
-            <item name="Developer's Guide" href="http://knox.apache.org/books/knox-0-5-0/dev-guide.html"/>
-            <item name="Quick Start" href="http://knox.apache.org/books/knox-0-5-0/knox-0-5-0.html#Quick+Start"/>
+            <item name="User's Guide" href="http://knox.apache.org/books/knox-0-6-0/user-guide.html"/>
+            <item name="Developer's Guide" href="http://knox.apache.org/books/knox-0-6-0/dev-guide.html"/>
+            <item name="Quick Start" href="http://knox.apache.org/books/knox-0-6-0/user-guide.html#Quick+Start"/>
             <item name="Dependencies" href="https://cwiki.apache.org/confluence/display/KNOX/Dependencies"/>
             <item name="Wiki" href="https://cwiki.apache.org/confluence/display/KNOX/Index"/>
         </menu>
 
         <menu name="Releases">
+            <item name="0.6.0" href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.6.0"/>
             <item name="0.5.1" href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.5.1"/>
             <item name="0.5.0" href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.5.0"/>
             <item name="0.4.0" href="https://cwiki.apache.org/confluence/display/KNOX/Release+0.4.0"/>