From 075bd201d2454d3dcc6ec5d37ef4e7344dfcab81 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Wed, 30 Nov 2022 08:26:38 +0100 Subject: [PATCH] Remove environment variables for ExecStart --- .../argeo-init/usr/lib/systemd/system/argeo@.service | 9 +++++---- .../argeo-init/usr/lib/systemd/user/argeo@.service | 5 +---- 2 files changed, 6 insertions(+), 8 deletions(-) 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 \ -- 2.30.2