From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 10 Jun 2021 07:16:48 +0000 (+0200)
Subject: Explicitly start Equinox DS.
X-Git-Tag: argeo-suite-2.3.1~45
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=8ca9b4621d1aff270241c4158ba83dff3edcde36

Explicitly start Equinox DS.
---

diff --git a/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/config.ini b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/config.ini
index 8a693fe..5596f00 100644
--- a/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/config.ini
+++ b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/config.ini
@@ -1,7 +1,7 @@
 org.osgi.service.http.port=8080
 #org.eclipse.equinox.http.jetty.http.host=[IP address to listen to]
 #osgi.console=[IP address to listen to]:2323
-osgi.console=2323
+#osgi.console=2323
 osgi.clean=true
 
 argeo.node.useradmin.uris=dc=example,dc=com.ldif
@@ -11,6 +11,7 @@ argeo.osgi.start.2.node=\
 org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.metatype,\
 org.eclipse.equinox.cm,\
+org.eclipse.equinox.ds,\
 org.eclipse.rap.rwt.osgi
 
 argeo.osgi.start.2.suite=\
@@ -30,4 +31,6 @@ org.argeo.documents.ui,\
 org.argeo.people.ui,\
 org.argeo.geo.ui
 
+log4j.configuration=file:/etc/argeo.d/suite/log4j.properties
+
 argeo.node.init=/etc/argeo.d/suite/init
diff --git a/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args
index 0945fb9..e69de29 100644
--- a/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args
+++ b/dist/argeo-suite-standard/rpm/etc/argeo.d/suite/jvm.args
@@ -1 +0,0 @@
--Dlog4j.configuration=file:/etc/argeo.d/suite/log4j.properties