You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2016/02/11 03:22:05 UTC
[1/2] nifi git commit: NIFI-1461 This closes #204. Implemented RPM
before/after logic to create user and more as listed in JIRA
Repository: nifi
Updated Branches:
refs/heads/master 778229eb5 -> f44eb643d
NIFI-1461 This closes #204. Implemented RPM before/after logic to create user and more as listed in JIRA
Signed-off-by: joewitt <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e00652e6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e00652e6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e00652e6
Branch: refs/heads/master
Commit: e00652e625e9ad0cf054fb84a05db5bd27b6926d
Parents: 778229e
Author: puspendu.banerjee@gmail.com <pu...@gmail.com>
Authored: Thu Feb 4 02:40:26 2016 -0600
Committer: joewitt <jo...@apache.org>
Committed: Wed Feb 10 21:21:10 2016 -0500
----------------------------------------------------------------------
nifi-assembly/pom.xml | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/e00652e6/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 15f27e4..760f947 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -489,8 +489,13 @@ language governing permissions and limitations under the License. -->
</defineStatements>
<defaultDirmode>750</defaultDirmode>
<defaultFilemode>640</defaultFilemode>
- <defaultUsername>root</defaultUsername>
- <defaultGroupname>root</defaultGroupname>
+ <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>
</configuration>
<executions>
<execution>
@@ -523,6 +528,9 @@ language governing permissions and limitations under the License. -->
</sources>
</mapping>
<mapping>
+ <directory>/opt/nifi</directory>
+ </mapping>
+ <mapping>
<directory>/opt/nifi/nifi-${project.version}/bin</directory>
<filemode>750</filemode>
<sources>
@@ -545,6 +553,9 @@ language governing permissions and limitations under the License. -->
</mapping>
<mapping>
<directory>/opt/nifi/nifi-${project.version}/lib</directory>
+ </mapping>
+ <mapping>
+ <directory>/opt/nifi/nifi-${project.version}/lib</directory>
<dependency>
<excludes>
<exclude>org.apache.nifi:nifi-bootstrap</exclude>
[2/2] nifi git commit: NIFI-1461 added run.as filtered property for
RPM and removed extraneous properties
Posted by jo...@apache.org.
NIFI-1461 added run.as filtered property for RPM and removed extraneous properties
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f44eb643
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f44eb643
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f44eb643
Branch: refs/heads/master
Commit: f44eb643dd4ccd50e804d1a96bae305f84c3dc2d
Parents: e00652e
Author: joewitt <jo...@apache.org>
Authored: Tue Feb 9 23:44:55 2016 -0500
Committer: joewitt <jo...@apache.org>
Committed: Wed Feb 10 21:21:19 2016 -0500
----------------------------------------------------------------------
nifi-assembly/pom.xml | 32 ++++++++++++--------
.../src/main/resources/conf/bootstrap.conf | 10 +++---
2 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/f44eb643/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 760f947..5e2c912 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/nifi/blob/f44eb643/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
index 056a073..6012e07 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
@@ -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.