From 64ab270af0600f3e2b3297723784e3a9613a2efa Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 5 May 2018 20:53:45 +0200
Subject: [PATCH] Use 'argeo' instead of 'node' as app name (in order to avoid
 conflicts with node.js packaging in EPEL, and more generally confusion with
 this framework)

---
 .../base/etc/argeo/log4j.properties           |  2 +-
 dist/argeo-node/base/etc/argeo/settings.sh    |  3 ++
 dist/argeo-node/pom.xml                       | 42 ++++++-------------
 dist/argeo-node/rpm/scripts/preinstall        |  2 +-
 .../system/{node.service => argeo.service}    |  6 +--
 .../rpm/usr/sbin/{nodectl => argeoctl}        |  2 +-
 6 files changed, 22 insertions(+), 35 deletions(-)
 create mode 100644 dist/argeo-node/base/etc/argeo/settings.sh
 rename dist/argeo-node/rpm/usr/lib/systemd/system/{node.service => argeo.service} (60%)
 rename dist/argeo-node/rpm/usr/sbin/{nodectl => argeoctl} (99%)

diff --git a/dist/argeo-node/base/etc/argeo/log4j.properties b/dist/argeo-node/base/etc/argeo/log4j.properties
index 45acf1f67..d93b23456 100644
--- a/dist/argeo-node/base/etc/argeo/log4j.properties
+++ b/dist/argeo-node/base/etc/argeo/log4j.properties
@@ -8,7 +8,7 @@ log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=%-5p %m%n
 
 log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.file.File=/var/log/node/node.csv
+log4j.appender.file.File=/var/log/argeo/argeo.csv
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{ISO8601};"%m";%c;%p%n
 log4j.appender.file.bufferedIO=true
diff --git a/dist/argeo-node/base/etc/argeo/settings.sh b/dist/argeo-node/base/etc/argeo/settings.sh
new file mode 100644
index 000000000..8141f0495
--- /dev/null
+++ b/dist/argeo-node/base/etc/argeo/settings.sh
@@ -0,0 +1,3 @@
+export LANG=en_US.utf8
+JAVA_OPTS="-showversion -Xmx128m"
+#JAVA_OPTS="-showversion -Xmx512m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=7084 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index 4b0f4a810..a181ade16 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -70,28 +70,28 @@
 									<name>argeo-node</name>
 									<mappings>
 										<mapping>
-											<directory>/etc/node</directory>
+											<directory>/etc/argeo</directory>
 											<username>root</username>
-											<groupname>node</groupname>
+											<groupname>argeo</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>rpm/etc/node</location>
+													<location>base/etc/argeo</location>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/etc/node/conf.d</directory>
+											<directory>/etc/argeo/conf.d</directory>
 											<username>root</username>
-											<groupname>node</groupname>
+											<groupname>argeo</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>rpm/etc/node/conf.d</location>
+													<location>base/etc/argeo/conf.d</location>
 													<includes>
 														<include>*.ini</include>
 														<include>*.txt</include>
@@ -100,47 +100,31 @@
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/lib/systemd/system</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>rpm/usr/lib/systemd/system</location>
-													<includes>
-														<include>*.service</include>
-													</includes>
-												</source>
-											</sources>
-										</mapping>
-										<mapping>
-											<directory>/usr/share/node</directory>
+											<directory>/usr/share/argeo</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>rpm/usr/share/node</location>
+													<location>base/share/argeo</location>
 													<includes>
-														<include>config.ini</include>
-														<include>all.policy</include>
+														<include>**</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/share/node/jjs</directory>
+											<directory>/usr/lib/systemd/system</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>rpm/usr/share/node/jjs</location>
+													<location>rpm/usr/lib/systemd/system</location>
 													<includes>
-														<include>*.js</include>
+														<include>*.service</include>
 													</includes>
 												</source>
 											</sources>
@@ -155,7 +139,7 @@
 												<source>
 													<location>rpm/usr/sbin</location>
 													<includes>
-														<include>nodectl</include>
+														<include>argeoctl</include>
 													</includes>
 												</source>
 											</sources>
diff --git a/dist/argeo-node/rpm/scripts/preinstall b/dist/argeo-node/rpm/scripts/preinstall
index a5415fc7d..2e4606555 100644
--- a/dist/argeo-node/rpm/scripts/preinstall
+++ b/dist/argeo-node/rpm/scripts/preinstall
@@ -1,5 +1,5 @@
 if [ $1 = "1" ];then
-	APP=node
+	APP=argeo
 	
 	# check if user exists
 	/bin/id $APP 2>/dev/null
diff --git a/dist/argeo-node/rpm/usr/lib/systemd/system/node.service b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo.service
similarity index 60%
rename from dist/argeo-node/rpm/usr/lib/systemd/system/node.service
rename to dist/argeo-node/rpm/usr/lib/systemd/system/argeo.service
index 80cd827a1..f30e9fb2e 100644
--- a/dist/argeo-node/rpm/usr/lib/systemd/system/node.service
+++ b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo.service
@@ -5,9 +5,9 @@ Wants=postgresql.service
 
 [Service]
 Type=simple
-PIDFile=/var/run/node/node.pid
-ExecStart=/usr/sbin/nodectl start
-ExecReload=/usr/sbin/nodectl reload
+PIDFile=/var/run/argeo/argeo.pid
+ExecStart=/usr/sbin/argeoctl start
+ExecReload=/usr/sbin/argeoctl reload
 SuccessExitStatus=143
 
 [Install]
diff --git a/dist/argeo-node/rpm/usr/sbin/nodectl b/dist/argeo-node/rpm/usr/sbin/argeoctl
similarity index 99%
rename from dist/argeo-node/rpm/usr/sbin/nodectl
rename to dist/argeo-node/rpm/usr/sbin/argeoctl
index e0703f0d1..ccadd8e9a 100755
--- a/dist/argeo-node/rpm/usr/sbin/nodectl
+++ b/dist/argeo-node/rpm/usr/sbin/argeoctl
@@ -1,5 +1,5 @@
 #!/bin/sh
-APP=node
+APP=argeo
 
 JVM=java
 
-- 
2.30.2