From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 10 Jun 2021 07:16:29 +0000 (+0200)
Subject: Change order of @ arguments file when calling the JVM, so that they are
X-Git-Tag: argeo-commons-2.1.103~21
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=9c60871d8b97f1846af578a282f326d8eb0006c8

Change order of @ arguments file when calling the JVM, so that they are
all taken into account.
---

diff --git a/dist/argeo-node/base/etc/argeo.d/jvm.args.debug b/dist/argeo-node/base/etc/argeo.d/jvm.args.debug
new file mode 100644
index 000000000..4e6b1dc59
--- /dev/null
+++ b/dist/argeo-node/base/etc/argeo.d/jvm.args.debug
@@ -0,0 +1 @@
+-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:8000
\ No newline at end of file
diff --git a/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
index b310048e1..c631825a2 100644
--- a/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
+++ b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
@@ -21,10 +21,10 @@ ExecStart=/usr/lib/jvm/jre-11/bin/java \
 -Dosgi.noShutdown=true \
 -Dorg.eclipse.equinox.http.jetty.autostart=false \
 -Dosgi.bundles=org.argeo.osgi.boot@start \
-@/usr/share/osgi/boot/framework.args \
 @/usr/share/argeo/jvm.args \
 @/etc/argeo.d/jvm.args \
 @/etc/argeo.d/%I/jvm.args \
+@/usr/share/osgi/boot/framework.args \
 -configuration /var/lib/argeo.d/%I/state \
 -data /var/lib/argeo.d/%I/data
 # Exit codes of the JVM when SIGTERM or SIGINT have been caught: