Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-2691 Replaced references to kerberos/spegno principle with principal in nifi.properties and admin guide 

This closes: #1105

Signed-off-by: Andre F de Miranda <trixpan@users.noreply.github.com>
This commit is contained in:
Andrew Lim 2016-10-05 11:27:52 -04:00 committed by Andre F de Miranda
parent 92cca96d49
commit 53f7a21663
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-docs/src/main/asciidoc/administration-guide.adoc
View File

@ -2109,7 +2109,7 @@ that is specified.
|==== |====
|*Property*|*Description* |*Property*|*Description*
|nifi.kerberos.krb5.file*|The location of the krb5 file, if used. It is blank by default. At this time, only a single krb5 file is allowed to |nifi.kerberos.krb5.file*|The location of the krb5 file, if used. It is blank by default. At this time, only a single krb5 file is allowed to
be specified per NiFi instance, so this property is configured here to support SPNEGO and service principles rather than in individual Processors. be specified per NiFi instance, so this property is configured here to support SPNEGO and service principals rather than in individual Processors.
If necessary the krb5 file can support multiple realms. If necessary the krb5 file can support multiple realms.
Example: `/etc/krb5.conf` Example: `/etc/krb5.conf`
|nifi.kerberos.service.principal*|The name of the NiFi Kerberos service principal, if used. It is blank by default. Note that this property is for NiFi to authenticate as a client other systems. |nifi.kerberos.service.principal*|The name of the NiFi Kerberos service principal, if used. It is blank by default. Note that this property is for NiFi to authenticate as a client other systems.

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
View File

@ -184,11 +184,11 @@ nifi.zookeeper.root.node=${nifi.zookeeper.root.node}
# kerberos # # kerberos #
nifi.kerberos.krb5.file=${nifi.kerberos.krb5.file} nifi.kerberos.krb5.file=${nifi.kerberos.krb5.file}
# kerberos service principle # # kerberos service principal #
nifi.kerberos.service.principal=${nifi.kerberos.service.principal} nifi.kerberos.service.principal=${nifi.kerberos.service.principal}
nifi.kerberos.service.keytab.location=${nifi.kerberos.service.keytab.location} nifi.kerberos.service.keytab.location=${nifi.kerberos.service.keytab.location}
# kerberos spnego principle # # kerberos spnego principal #
nifi.kerberos.spnego.principal=${nifi.kerberos.spnego.principal} nifi.kerberos.spnego.principal=${nifi.kerberos.spnego.principal}
nifi.kerberos.spnego.keytab.location=${nifi.kerberos.spnego.keytab.location} nifi.kerberos.spnego.keytab.location=${nifi.kerberos.spnego.keytab.location}
nifi.kerberos.spnego.authentication.expiration=${nifi.kerberos.spnego.authentication.expiration} nifi.kerberos.spnego.authentication.expiration=${nifi.kerberos.spnego.authentication.expiration}