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

NIFI-1461 added run.as filtered property for RPM and removed extraneous properties

This commit is contained in:
joewitt 2016-02-09 23:44:55 -05:00
parent e00652e625
commit f44eb643dd
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nifi-assembly/pom.xml
View File

@ -281,13 +281,9 @@ language governing permissions and limitations under the License. -->
<properties>
<!--Wrapper Properties -->
<nifi.wrapper.jvm.heap.initial.mb>256</nifi.wrapper.jvm.heap.initial.mb>
<nifi.wrapper.jvm.heap.max.mb>512</nifi.wrapper.jvm.heap.max.mb>
<nifi.initial.permgen.size.mb>128</nifi.initial.permgen.size.mb>
<nifi.max.permgen.size.mb>128</nifi.max.permgen.size.mb>
<nifi.wrapper.logfile.maxsize>10m</nifi.wrapper.logfile.maxsize>
<nifi.wrapper.logfile.maxfiles>10</nifi.wrapper.logfile.maxfiles>
<nifi.jvm.heap.mb>512</nifi.jvm.heap.mb>
<nifi.jvm.permgen.mb>128</nifi.jvm.permgen.mb>
<nifi.run.as></nifi.run.as>
<!-- nifi.properties: core properties -->
<nifi.version>${project.version}</nifi.version>
<nifi.flowcontroller.autoResumeState>true</nifi.flowcontroller.autoResumeState>
@ -439,6 +435,9 @@ language governing permissions and limitations under the License. -->
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<nifi.run.as>nifi</nifi.run.as>
</properties>
<build>
<plugins>
<plugin>
@ -491,11 +490,11 @@ language governing permissions and limitations under the License. -->
<defaultFilemode>640</defaultFilemode>
<defaultUsername>nifi</defaultUsername>
<defaultGroupname>nifi</defaultGroupname>
<preinstallScriptlet>
<script>
/usr/bin/getent group nifi >/dev/null || /usr/sbin/groupadd -r nifi; /usr/bin/getent passwd nifi >/dev/null || /usr/sbin/useradd -r -g nifi -d /opt/nifi -s /sbin/nologin -c "NiFi System User" nifi
</script>
</preinstallScriptlet>
<preinstallScriptlet>
<script>
/usr/bin/getent group nifi >/dev/null || /usr/sbin/groupadd -r nifi; /usr/bin/getent passwd nifi >/dev/null || /usr/sbin/useradd -r -g nifi -d /opt/nifi -s /sbin/nologin -c "NiFi System User" nifi
</script>
</preinstallScriptlet>
</configuration>
<executions>
<execution>
@ -561,6 +560,15 @@ language governing permissions and limitations under the License. -->
<exclude>org.apache.nifi:nifi-bootstrap</exclude>
<exclude>org.apache.nifi:nifi-resources</exclude>
<exclude>org.apache.nifi:nifi-docs</exclude>
<exclude>commons-io:commons-io</exclude>
<exclude>org.apache.commons:commons-lang3</exclude>
<exclude>org.antlr:antlr-runtime</exclude>
<exclude>javax.activation:activation</exclude>
<exclude>javax.mail:mail</exclude>
<exclude>org.apache.nifi:nifi-security-utils</exclude>
<exclude>org.apache.nifi:nifi-utils</exclude>
<exclude>org.apache.nifi:nifi-processor-utils</exclude>
<exclude>org.apache.nifi:nifi-expression-language</exclude>
</excludes>
</dependency>
</mapping>

10
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
View File

@ -19,7 +19,7 @@
java=java
# Username to use when running NiFi. This value will be ignored on Windows.
run.as=
run.as=${nifi.run.as}
# Configure where NiFi's lib and conf directories live
lib.dir=./lib
@ -32,8 +32,8 @@ graceful.shutdown.seconds=20
java.arg.1=-Dorg.apache.jasper.compiler.disablejsr199=true
# JVM memory settings
java.arg.2=-Xms512m
java.arg.3=-Xmx512m
java.arg.2=-Xms${nifi.jvm.heap.mb}m
java.arg.3=-Xmx${nifi.jvm.heap.mb}m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
@ -49,8 +49,8 @@ java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
#java.arg.7=-XX:ReservedCodeCacheSize=256m
#java.arg.8=-XX:CodeCacheFlushingMinimumFreeSpace=10m
#java.arg.9=-XX:+UseCodeCacheFlushing
#java.arg.11=-XX:PermSize=128M
#java.arg.12=-XX:MaxPermSize=128M
#java.arg.11=-XX:PermSize=${nifi.jvm.permgen.mb}M
#java.arg.12=-XX:MaxPermSize=${nifi.jvm.permgen.mb}M
# The G1GC is still considered experimental but has proven to be very advantageous in providing great
# performance without significant "stop-the-world" delays.