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
--- /dev/null
+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"
<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>
</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>
<source>
<location>rpm/usr/sbin</location>
<includes>
- <include>nodectl</include>
+ <include>argeoctl</include>
</includes>
</source>
</sources>
if [ $1 = "1" ];then
- APP=node
+ APP=argeo
# check if user exists
/bin/id $APP 2>/dev/null
--- /dev/null
+[Unit]
+Description=Argeo Node
+After=network.target
+Wants=postgresql.service
+
+[Service]
+Type=simple
+PIDFile=/var/run/argeo/argeo.pid
+ExecStart=/usr/sbin/argeoctl start
+ExecReload=/usr/sbin/argeoctl reload
+SuccessExitStatus=143
+
+[Install]
+WantedBy=multi-user.target
+++ /dev/null
-[Unit]
-Description=Argeo Node
-After=network.target
-Wants=postgresql.service
-
-[Service]
-Type=simple
-PIDFile=/var/run/node/node.pid
-ExecStart=/usr/sbin/nodectl start
-ExecReload=/usr/sbin/nodectl reload
-SuccessExitStatus=143
-
-[Install]
-WantedBy=multi-user.target
--- /dev/null
+#!/bin/sh
+APP=argeo
+
+JVM=java
+
+# Directories and files
+CONF_DIR=/etc/$APP
+CONF_DIRS=/etc/$APP/conf.d
+BASE_POLICY_ALL=/usr/share/$APP/all.policy
+BASE_CONFIG_INI=/usr/share/$APP/config.ini
+
+EXEC_DIR=/var/lib/$APP
+DATA_DIR=$EXEC_DIR/data
+CONF_RW=$EXEC_DIR/state
+CONFIG_INI=$CONF_RW/config.ini
+
+OSGI_INSTALL_AREA=/usr/share/osgi/boot
+OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
+
+# Overwrite variables
+if [ -f $CONF_DIR/settings.sh ];then
+ . $CONF_DIR/settings.sh
+fi
+
+RETVAL=0
+
+start() {
+ mkdir -p $CONF_RW
+ mkdir -p $DATA_DIR
+
+ # Merge config files
+ printf "## Equinox configuration - Generated by /usr/sbin/nodectl ##\n\n" > $CONFIG_INI
+ cat $BASE_CONFIG_INI >> $CONFIG_INI
+ printf "\n##\n## $CONF_DIR/$APP.ini\n##\n\n" >> $CONFIG_INI
+ cat $CONF_DIR/$APP.ini >> $CONFIG_INI
+ for file in `ls -v $CONF_DIRS/*.ini`; do
+ printf "\n##\n## $file\n##\n\n" >> $CONFIG_INI
+ cat $file >> $CONFIG_INI
+ done;
+
+ cd $EXEC_DIR
+ $JVM \
+ -Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
+ $JAVA_OPTS -jar $OSGI_FRAMEWORK \
+ -configuration "$CONF_RW" \
+ -data "$DATA_DIR"
+}
+
+reload() {
+ echo Not yet implemented
+}
+
+stop() {
+ if [ -f $PID_FILE ];then
+ PID=`cat $PID_FILE`
+ kill -0 $PID &> /dev/null
+ PID_EXISTS=$?
+ if [ $PID_EXISTS -ne 0 ]; then
+ echo Dead $APP process with pid $PID, removing $PID_FILE
+ rm -f $PID_FILE
+ RETVAL=1
+ return $RETVAL
+ fi
+ else
+ echo $APP is not running
+ RETVAL=1
+ return $RETVAL
+ fi
+
+ # notifies application by removing the shutdown file
+# rm -f $SHUTDOWN_FILE
+ kill $PID
+
+ # wait 10 min for application to shutdown, then kill it
+ TIMEOUT=$((10*60))
+ BEGIN=$(date +%s)
+ while kill -0 $PID &> /dev/null
+ do
+ sleep 1
+ NOW=$(date +%s)
+ DURATION=$(($NOW-$BEGIN))
+ if [ $DURATION -gt $TIMEOUT ]; then
+ kill -9 $PID
+ echo Forcibly killed $APP with pid $PID
+ RETVAL=1
+ fi
+ done
+
+ # remove pid file
+ rm -f $PID_FILE
+ return $RETVAL
+}
+
+status() {
+ if [ -f $PID_FILE ];then
+ PID=`cat $PID_FILE`
+ else
+ echo $APP is not running
+ return $RETVAL
+ fi
+ kill -0 $PID &> /dev/null
+ PID_EXISTS=$?
+ if [ $PID_EXISTS -eq 0 ]; then
+ echo $APP is running with pid $PID ...
+ else
+ echo No $APP process with pid $PID, removing $PID_FILE
+ rm -f $PID_FILE
+ fi
+ return $RETVAL
+}
+
+# main
+case "$1" in
+ start)
+ start
+ ;;
+ reload)
+ reload
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status}"
+ exit 1
+esac
\ No newline at end of file
+++ /dev/null
-#!/bin/sh
-APP=node
-
-JVM=java
-
-# Directories and files
-CONF_DIR=/etc/$APP
-CONF_DIRS=/etc/$APP/conf.d
-BASE_POLICY_ALL=/usr/share/$APP/all.policy
-BASE_CONFIG_INI=/usr/share/$APP/config.ini
-
-EXEC_DIR=/var/lib/$APP
-DATA_DIR=$EXEC_DIR/data
-CONF_RW=$EXEC_DIR/state
-CONFIG_INI=$CONF_RW/config.ini
-
-OSGI_INSTALL_AREA=/usr/share/osgi/boot
-OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
-
-# Overwrite variables
-if [ -f $CONF_DIR/settings.sh ];then
- . $CONF_DIR/settings.sh
-fi
-
-RETVAL=0
-
-start() {
- mkdir -p $CONF_RW
- mkdir -p $DATA_DIR
-
- # Merge config files
- printf "## Equinox configuration - Generated by /usr/sbin/nodectl ##\n\n" > $CONFIG_INI
- cat $BASE_CONFIG_INI >> $CONFIG_INI
- printf "\n##\n## $CONF_DIR/$APP.ini\n##\n\n" >> $CONFIG_INI
- cat $CONF_DIR/$APP.ini >> $CONFIG_INI
- for file in `ls -v $CONF_DIRS/*.ini`; do
- printf "\n##\n## $file\n##\n\n" >> $CONFIG_INI
- cat $file >> $CONFIG_INI
- done;
-
- cd $EXEC_DIR
- $JVM \
- -Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
- $JAVA_OPTS -jar $OSGI_FRAMEWORK \
- -configuration "$CONF_RW" \
- -data "$DATA_DIR"
-}
-
-reload() {
- echo Not yet implemented
-}
-
-stop() {
- if [ -f $PID_FILE ];then
- PID=`cat $PID_FILE`
- kill -0 $PID &> /dev/null
- PID_EXISTS=$?
- if [ $PID_EXISTS -ne 0 ]; then
- echo Dead $APP process with pid $PID, removing $PID_FILE
- rm -f $PID_FILE
- RETVAL=1
- return $RETVAL
- fi
- else
- echo $APP is not running
- RETVAL=1
- return $RETVAL
- fi
-
- # notifies application by removing the shutdown file
-# rm -f $SHUTDOWN_FILE
- kill $PID
-
- # wait 10 min for application to shutdown, then kill it
- TIMEOUT=$((10*60))
- BEGIN=$(date +%s)
- while kill -0 $PID &> /dev/null
- do
- sleep 1
- NOW=$(date +%s)
- DURATION=$(($NOW-$BEGIN))
- if [ $DURATION -gt $TIMEOUT ]; then
- kill -9 $PID
- echo Forcibly killed $APP with pid $PID
- RETVAL=1
- fi
- done
-
- # remove pid file
- rm -f $PID_FILE
- return $RETVAL
-}
-
-status() {
- if [ -f $PID_FILE ];then
- PID=`cat $PID_FILE`
- else
- echo $APP is not running
- return $RETVAL
- fi
- kill -0 $PID &> /dev/null
- PID_EXISTS=$?
- if [ $PID_EXISTS -eq 0 ]; then
- echo $APP is running with pid $PID ...
- else
- echo No $APP process with pid $PID, removing $PID_FILE
- rm -f $PID_FILE
- fi
- return $RETVAL
-}
-
-# main
-case "$1" in
- start)
- start
- ;;
- reload)
- reload
- ;;
- stop)
- stop
- ;;
- status)
- status
- ;;
- *)
- echo $"Usage: $0 {start|stop|status}"
- exit 1
-esac
\ No newline at end of file
projects / lgpl / argeo-commons.git / commitdiff