From e93d59717265bb9f9eab644dfc55dee1ade33386 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 10 Mar 2018 15:58:44 +0100
Subject: [PATCH] Improve node packaging

---
 dist/argeo-node/rpm/etc/node/node.ini         |  6 ++++++
 dist/argeo-node/rpm/usr/sbin/nodectl          | 17 +++++++++--------
 dist/argeo-node/rpm/usr/share/node/config.ini |  1 -
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/dist/argeo-node/rpm/etc/node/node.ini b/dist/argeo-node/rpm/etc/node/node.ini
index f150c4df9..e1c3d8fa2 100644
--- 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 0aba3dc59..e0703f0d1 100755
--- 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 4b5c629e4..2e9f7e44b 100644
--- 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=\
-- 
2.30.2