From: Mathieu <mbaudier@argeo.org>
Date: Wed, 30 Nov 2022 07:26:38 +0000 (+0100)
Subject: Remove environment variables for ExecStart
X-Git-Tag: v2.3.12~1
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=075bd201d2454d3dcc6ec5d37ef4e7344dfcab81

Remove environment variables for ExecStart
---

diff --git a/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service b/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service
index 1bdf8c827..2c69636ac 100644
--- a/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service
+++ b/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service
@@ -5,16 +5,17 @@ Wants=postgresql.service
 
 [Service]
 Type=simple
+
+User=daemon
+Group=daemon
+
 StateDirectory=argeo.d/%I
 LogsDirectory=argeo.d/%I
 ConfigurationDirectory=argeo.d/%I
 CacheDirectory=argeo.d/%I
 WorkingDirectory=/var/lib/argeo.d/%I
 
-Environment=JVM=java
-Environment=JVM_OPTS=
-
-ExecStart=${JVM} ${JVM_OPTS} \
+ExecStart=java \
 -Dosgi.configuration.cascaded=true \
 -Dosgi.sharedConfiguration.area=/etc/argeo.d/%I/ \
 -Dosgi.sharedConfiguration.area.readOnly=true \
diff --git a/sdk/deploy/argeo-init/usr/lib/systemd/user/argeo@.service b/sdk/deploy/argeo-init/usr/lib/systemd/user/argeo@.service
index 708d416a2..345685a97 100644
--- a/sdk/deploy/argeo-init/usr/lib/systemd/user/argeo@.service
+++ b/sdk/deploy/argeo-init/usr/lib/systemd/user/argeo@.service
@@ -9,10 +9,7 @@ ConfigurationDirectory=argeo.d/%I
 CacheDirectory=argeo.d/%I
 #WorkingDirectory=
 
-Environment=JVM=java
-Environment=JVM_OPTS=
-
-ExecStart=${JVM} ${JVM_OPTS} \
+ExecStart=java \
 -Dosgi.configuration.cascaded=true \
 -Dosgi.sharedConfiguration.area=/etc/argeo.user.d/%I/ \
 -Dosgi.sharedConfiguration.area.readOnly=true \