From ed37ad5f3228e19d75cda12e366ccdc05170fbe4 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 6 Nov 2011 21:13:03 +0000
Subject: [PATCH] osgiboot: Improve ogi-service script

git-svn-id: https://svn.argeo.org/commons/trunk@4894 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../osgi-boot/src/main/rpm/usr/sbin/osgi-service  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
index 7d1ad6e5c..6fbb1e41c 100644
--- a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
+++ b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
@@ -16,7 +16,8 @@ LIB_DIR=/usr/share/$APP/lib
 EXEC_DIR=/var/lib/$APP
 DATA_DIR=$EXEC_DIR/data
 CONF_RW=$EXEC_DIR/conf
-LOG_FILE=/var/log/$APP.log
+LOG_DIR=/var/log/$APP
+LOG_FILE=$LOG_DIR/$APP.log
 
 RUN_DIR=/var/run
 PID_FILE=$RUN_DIR/$APP.pid
@@ -28,10 +29,17 @@ OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
 RETVAL=0
 
 start() {
-	cp $CONF_DIR/config.ini $CONF_RW/config.ini
+	if [ ! -d $LOG_DIR ];then
+		mkdir -m 0750 -p $LOG_DIR
+		touch $LOG_FILE
+		chown -R $APP.$APP $LOG_DIR
+	fi
+
+	cp --preserve $CONF_DIR/config.ini $CONF_RW/config.ini
 	touch $SHUTDOWN_FILE
 	cd $EXEC_DIR
-	$JVM \
+	# start as user $APP
+	sudo -u $APP $JVM \
 		-Dosgi.bundles="org.argeo.osgi.boot.jar@start" \
 		-Dargeo.osgi.bundles="$CONF_DIR/modules;in=*,$LIB_DIR;in=*" \
 		-Dargeo.osgi.shutdownFile="$SHUTDOWN_FILE" \
@@ -51,6 +59,7 @@ stop() {
 	if [ -f $PID_FILE ];then
 		PID=`cat $PID_FILE`
 	else
+		echo $APP is not running
 		return $RETVAL
 	fi
 	rm -f $SHUTDOWN_FILE
-- 
2.30.2