You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by af...@apache.org on 2016/10/06 14:23:34 UTC
nifi git commit: NIFI-2691 Replaced references to kerberos/spegno
principle with principal in nifi.properties and admin guide
Repository: nifi
Updated Branches:
refs/heads/master 92cca96d4 -> 53f7a2166
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 <tr...@users.noreply.github.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/53f7a216
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/53f7a216
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/53f7a216
Branch: refs/heads/master
Commit: 53f7a2166360de4f73a2fefbb0e6b6349ba92455
Parents: 92cca96
Author: Andrew Lim <an...@gmail.com>
Authored: Wed Oct 5 11:27:52 2016 -0400
Committer: Andre F de Miranda <tr...@users.noreply.github.com>
Committed: Fri Oct 7 01:22:49 2016 +1100
----------------------------------------------------------------------
nifi-docs/src/main/asciidoc/administration-guide.adoc | 2 +-
.../nifi-resources/src/main/resources/conf/nifi.properties | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/53f7a216/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index ec5c64a..67a912a 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.
http://git-wip-us.apache.org/repos/asf/nifi/blob/53f7a216/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
----------------------------------------------------------------------
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 3cbdcb0..d34380c 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}