Improve node packaging

diff --git a/dist/argeo-node/rpm/etc/node/node.ini b/dist/argeo-node/rpm/etc/node/node.ini
index f150c4df925830a223c73f128dbc3620ce339d22..e1c3d8fa2b637923568d76d8a0ab84de016e75f8 100644 (file)
--- a/dist/argeo-node/rpm/etc/node/node.ini
+++ b/dist/argeo-node/rpm/etc/node/node.ini
@@ -1,3 +1,9 @@
+## Provisioning
+argeo.osgi.bundles=\
+/etc/node/modules;in=*/*,\
+/usr/local/share/osgi;in=**/*.jar,\
+/usr/share/osgi;in=**/*.jar;ex=boot/*.jar
+
 ## HTTP server
 org.osgi.service.http.port=8080
 

diff --git a/dist/argeo-node/rpm/usr/sbin/nodectl b/dist/argeo-node/rpm/usr/sbin/nodectl
index 0aba3dc59c192d0a54a5eb44d04fbab68f4aa2dc..e0703f0d121401538544e74af4652a6848a190d2 100755 (executable)
--- a/dist/argeo-node/rpm/usr/sbin/nodectl
+++ b/dist/argeo-node/rpm/usr/sbin/nodectl
@@ -28,14 +28,15 @@ start() {
        mkdir -p $CONF_RW
        mkdir -p $DATA_DIR
 
-       # Merge config files
-       echo ## Equinox configuration - Generated by /usr/sbin/nodectl > $CONFIG_INI
-       cat $BASE_CONFIG_INI >> $CONFIG_INI
-       cat $CONF_DIR/$APP.ini >> $CONFIG_INI
-       for file in `ls -v $CONF_DIRS/*.ini`; do
-               echo "\n# $file\n" >> $CONFIG_INI;
-               cat $file >> $CONFIG_INI
-       done;
+    # 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 \

diff --git a/dist/argeo-node/rpm/usr/share/node/config.ini b/dist/argeo-node/rpm/usr/share/node/config.ini
index 4b5c629e4388790ae4fe2de680b68b9aa1ddb8b3..2e9f7e44b98a4e025179fa266b13cf2ed58fe0ef 100644 (file)
--- a/dist/argeo-node/rpm/usr/share/node/config.ini
+++ b/dist/argeo-node/rpm/usr/share/node/config.ini
@@ -1,6 +1,5 @@
 # Only Argeo OSGi Boot is explicitly started
 osgi.bundles=org.argeo.osgi.boot@start
-osgi.clean=true
 
 # Provisioning
 argeo.osgi.bundles=\