Author: elserj Date: Thu Feb 15 03:01:19 2018 New Revision: 1824277 URL: http://svn.apache.org/viewvc?rev=1824277&view=rev Log: PHOENIX-4533 Update documentation for PQS SPNEGO configuration changes
Modified: phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/server.html phoenix/site/source/src/site/markdown/server.md Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1824277&r1=1824276&r2=1824277&view=diff ============================================================================== --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Thu Feb 15 03:01:19 2018 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2018-02-08 + Generated by Apache Maven Doxia at 2018-02-14 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1824277&r1=1824276&r2=1824277&view=diff ============================================================================== --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Thu Feb 15 03:01:19 2018 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2018-02-08 + Generated by Apache Maven Doxia at 2018-02-14 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1824277&r1=1824276&r2=1824277&view=diff ============================================================================== --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Thu Feb 15 03:01:19 2018 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2018-02-08 + Generated by Apache Maven Doxia at 2018-02-14 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> Modified: phoenix/site/publish/server.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/server.html?rev=1824277&r1=1824276&r2=1824277&view=diff ============================================================================== --- phoenix/site/publish/server.html (original) +++ phoenix/site/publish/server.html Thu Feb 15 03:01:19 2018 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2018-02-08 + Generated by Apache Maven Doxia at 2018-02-14 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -290,7 +290,17 @@ log4j.logger.org.eclipse.jetty.server=IN </tr> <tr class="a"> <td><small>phoenix.queryserver.kerberos.principal</small></td> - <td style="text-align: left;">The kerberos principal to use when authenticating.</td> + <td style="text-align: left;">The kerberos principal to use when authenticating. If phoenix.queryserver.kerberos.http.principal is not configured, this principal specified will be also used to both authenticate SPNEGO connections and to connect to HBase.</td> + <td><i>unset</i></td> + </tr> + <tr class="b"> + <td><small>phoenix.queryserver.http.keytab.file</small></td> + <td style="text-align: left;">The keytab file to use for authenticating SPNEGO connections. This configuration MUST be specified if phoenix.queryserver.kerberos.http.principal is configured. phoenix.queryserver.keytab.file will be used if this property is undefined.</td> + <td><i>unset</i></td> + </tr> + <tr class="a"> + <td><small>phoenix.queryserver.kerberos.http.principal</small></td> + <td style="text-align: left;">The kerberos principal to use when authenticating SPNEGO connections. phoenix.queryserver.kerberos.principal will be used if this property is undefined.</td> <td><i>unset</i></td> </tr> <tr class="b"> Modified: phoenix/site/source/src/site/markdown/server.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/server.md?rev=1824277&r1=1824276&r2=1824277&view=diff ============================================================================== --- phoenix/site/source/src/site/markdown/server.md (original) +++ phoenix/site/source/src/site/markdown/server.md Thu Feb 15 03:01:19 2018 @@ -170,7 +170,22 @@ configuration. </tr> <tr> <td><small>phoenix.queryserver.kerberos.principal</small></td> - <td style="text-align: left;">The kerberos principal to use when authenticating.</td> + <td style="text-align: left;">The kerberos principal to use when authenticating. If + phoenix.queryserver.kerberos.http.principal is not configured, this principal specified will be also used to + both authenticate SPNEGO connections and to connect to HBase.</td> + <td><em>unset</em></td> + </tr> + <tr> + <td><small>phoenix.queryserver.http.keytab.file</small></td> + <td style="text-align: left;">The keytab file to use for authenticating SPNEGO connections. This configuration MUST be specified if + phoenix.queryserver.kerberos.http.principal is configured. phoenix.queryserver.keytab.file will be used if this + property is undefined.</td> + <td><em>unset</em></td> + </tr> + <tr> + <td><small>phoenix.queryserver.kerberos.http.principal</small></td> + <td style="text-align: left;">The kerberos principal to use when authenticating SPNEGO connections. + phoenix.queryserver.kerberos.principal will be used if this property is undefined.</td> <td><em>unset</em></td> </tr> <tr>