diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index ec5c64ac96..67a912a7d6 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -2109,7 +2109,7 @@ that is specified. |==== |*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 - 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. 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. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties index 3cbdcb0c25..d34380c3d1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties @@ -184,11 +184,11 @@ nifi.zookeeper.root.node=${nifi.zookeeper.root.node} # kerberos # 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.keytab.location=${nifi.kerberos.service.keytab.location} -# kerberos spnego principle # +# kerberos spnego principal # nifi.kerberos.spnego.principal=${nifi.kerberos.spnego.principal} nifi.kerberos.spnego.keytab.location=${nifi.kerberos.spnego.keytab.location} nifi.kerberos.spnego.authentication.expiration=${nifi.kerberos.spnego.authentication.expiration}