Improve node rpm

diff --git a/dist/argeo-node/rpm/scripts/preinstall b/dist/argeo-node/rpm/scripts/preinstall
index dd4ad948090e2ddc9957058bbf5fbb5c7487e4e2..a5415fc7d29c03429b8d2ad2cd8c51689a42c704 100644 (file)
--- 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 5c54d84e1667de194e0f43852a8f2a9f88fd9852..4b5c629e4388790ae4fe2de680b68b9aa1ddb8b3 100644 (file)
--- 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=\