This is an automated email from the ASF dual-hosted git repository. bbende pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
commit e9a443fe2e1424087fd4063f6d43e55a461ffbcb Author: Bryan Bende <[email protected]> AuthorDate: Thu Jul 23 08:13:56 2020 -0400 NIFI-7521 Remove additional unused property from nifi proeprties This closes #4327. --- nifi-docs/src/main/asciidoc/administration-guide.adoc | 1 - .../nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml | 1 - .../nifi-resources/src/main/resources/conf/nifi.properties | 1 - 3 files changed, 3 deletions(-) diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index ffa9d06..26a1d2b 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -3240,7 +3240,6 @@ These properties pertain to the web-based User Interface. |==== |*Property*|*Description* -|`nifi.web.war.directory`|This is the location of the web war directory. The default value is `./lib`. |`nifi.web.http.host`|The HTTP host. It is blank by default. |`nifi.web.http.port`|The HTTP port. The default value is `8080`. |`nifi.web.http.port.forwarding`|The port which forwards incoming HTTP requests to `nifi.web.http.host`. This property is designed to be used with 'port forwarding', when NiFi has to be started by a non-root user for better security, yet it needs to be accessed via low port to go through a firewall. For example, to expose NiFi via HTTP protocol on port 80, but actually listening on port 8080, you need to configure OS level port forwarding such as `iptables` (Linux/Unix) or `pfctl` (OS X) [...] diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml index c5fa126..f1bf3e1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml @@ -125,7 +125,6 @@ <nifi.components.status.snapshot.frequency>1 min</nifi.components.status.snapshot.frequency> <!-- nifi.properties: web properties --> - <nifi.web.war.directory>./lib</nifi.web.war.directory> <nifi.web.http.host /> <nifi.web.http.port>8080</nifi.web.http.port> <nifi.web.http.network.interface.default /> 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 28a9c30..9f2d544 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 @@ -133,7 +133,6 @@ nifi.remote.input.http.transaction.ttl=30 sec nifi.remote.contents.cache.expiration=30 secs # web properties # -nifi.web.war.directory=${nifi.web.war.directory} nifi.web.http.host=${nifi.web.http.host} nifi.web.http.port=${nifi.web.http.port} nifi.web.http.network.interface.default=${nifi.web.http.network.interface.default}
