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 1bdf8c8277c9e5eafcadf8b202e2f00c01b734e9..2c69636acf74d88856d62a0cd8586594896665aa 100644 (file)
--- 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 708d416a22c09d1d43e89ca7db27b64fd303ffba..345685a97cd981860ba95a059d731f32adda68da 100644 (file)
--- 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 \