HDFS-2368. Move SPNEGO conf properties from hdfs-default.xml to hdfs-site.xml.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1176719 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2011-09-28 04:51:29 +00:00
parent eda0ad4fd0
commit 59265d6ed8
3 changed files with 23 additions and 20 deletions

View File

@ -144,6 +144,26 @@
</description> </description>
</property> </property>
<property>
<name>dfs.web.authentication.kerberos.principal</name>
<value>HTTP/_HOST@${local.realm}</value>
<description>
The HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
</property>
<property>
<name>dfs.web.authentication.kerberos.keytab</name>
<value>/etc/security/keytabs/nn.service.keytab</value>
<description>
The Kerberos keytab file with the credentials for the
HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
</description>
</property>
<property> <property>
<name>dfs.namenode.keytab.file</name> <name>dfs.namenode.keytab.file</name>
<value>/etc/security/keytabs/nn.service.keytab</value> <value>/etc/security/keytabs/nn.service.keytab</value>

View File

@ -44,6 +44,9 @@ Trunk (unreleased changes)
HDFS-2356. Support case insensitive query parameter names in webhdfs. HDFS-2356. Support case insensitive query parameter names in webhdfs.
(szetszwo) (szetszwo)
HDFS-2368. Move SPNEGO conf properties from hdfs-default.xml to
hdfs-site.xml. (szetszwo)
BUG FIXES BUG FIXES
HDFS-2287. TestParallelRead has a small off-by-one bug. (todd) HDFS-2287. TestParallelRead has a small off-by-one bug. (todd)

View File

@ -683,24 +683,4 @@ creations/deletions), or "all".</description>
</description> </description>
</property> </property>
<property>
<name>dfs.web.authentication.kerberos.principal</name>
<value>HTTP/${dfs.web.hostname}@${kerberos.realm}</value>
<description>
The HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
HTTP SPENGO specification.
</description>
</property>
<property>
<name>dfs.web.authentication.kerberos.keytab</name>
<value>${user.home}/dfs.web.keytab</value>
<description>
The Kerberos keytab file with the credentials for the
HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
</description>
</property>
</configuration> </configuration>