From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 29 Jan 2018 16:45:23 +0000 (+0100)
Subject: Improve node rpm
X-Git-Tag: argeo-commons-2.1.71~34
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=5b0051363ebe9bcf34282a3cd76e65b12166e073;p=lgpl%2Fargeo-commons.git

Improve node rpm
---

diff --git a/dist/argeo-node/rpm/scripts/preinstall b/dist/argeo-node/rpm/scripts/preinstall
index dd4ad9480..a5415fc7d 100644
--- a/dist/argeo-node/rpm/scripts/preinstall
+++ b/dist/argeo-node/rpm/scripts/preinstall
@@ -6,12 +6,10 @@ if [ $1 = "1" ];then
 	if [ $? -ne 0 ];then
 		echo Create user $APP...
 		useradd --system --home-dir /var/lib/$APP --shell /bin/bash --user-group --create-home $APP
+	else
+		echo User $APP already exists
 	fi
 	
 	mkdir -p /var/lib/$APP/{state,data,indexes}
-	chown $APP.$APP /var/lib/$APP
-	mkdir -p /var/run/$APP
-	chown $APP.$APP /var/run/$APP
-	mkdir -p /var/log/$APP
-	chown $APP.$APP /var/log/$APP
+	chown -R $APP.$APP /var/lib/$APP
 fi
\ No newline at end of file
diff --git a/dist/argeo-node/rpm/usr/share/node/config.ini b/dist/argeo-node/rpm/usr/share/node/config.ini
index 5c54d84e1..4b5c629e4 100644
--- a/dist/argeo-node/rpm/usr/share/node/config.ini
+++ b/dist/argeo-node/rpm/usr/share/node/config.ini
@@ -1,12 +1,12 @@
 # Only Argeo OSGi Boot is explicitly started
-osgi.bundles=org.argeo.osgi.boot.jar@start
+osgi.bundles=org.argeo.osgi.boot@start
 osgi.clean=true
 
 # Provisioning
 argeo.osgi.bundles=\
 /etc/node/modules;in=*/*,\
 /usr/local/share/osgi;in=**/*.jar,\
-/usr/share/osgi;in=**/*.jar
+/usr/share/osgi;in=**/*.jar;ex=boot/*.jar
 
 # Required standard bundles to start
 argeo.osgi.start.2.node=\