From f08e1285ad0fe508126e946eff8216dae5f288f4 Mon Sep 17 00:00:00 2001
From: Mathieu <mbaudier@argeo.org>
Date: Wed, 30 Nov 2022 06:38:44 +0100
Subject: [PATCH] Improve systemd services

---
 .../usr/lib/systemd/system/argeo@.service          | 14 ++++++++++++--
 .../argeo-init/usr/lib/systemd/user/argeo@.service |  5 ++++-
 2 files changed, 16 insertions(+), 3 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 91d77b608..1bdf8c827 100644
--- a/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service
+++ b/sdk/deploy/argeo-init/usr/lib/systemd/system/argeo@.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Argeo node %I
-After=network.target
+After=network-online.target
 Wants=postgresql.service
 
 [Service]
@@ -11,7 +11,10 @@ ConfigurationDirectory=argeo.d/%I
 CacheDirectory=argeo.d/%I
 WorkingDirectory=/var/lib/argeo.d/%I
 
-ExecStart=java \
+Environment=JVM=java
+Environment=JVM_OPTS=
+
+ExecStart=${JVM} ${JVM_OPTS} \
 -Dosgi.configuration.cascaded=true \
 -Dosgi.sharedConfiguration.area=/etc/argeo.d/%I/ \
 -Dosgi.sharedConfiguration.area.readOnly=true \
@@ -24,8 +27,15 @@ ExecStart=java \
 @/etc/argeo.d/jvm.args \
 @${CONFIGURATION_DIRECTORY}/jvm.args \
 @/usr/share/argeo/jvm.args
+
 # Exit codes of the JVM when SIGTERM or SIGINT have been caught:
 SuccessExitStatus=143 130
 
+CPUAccounting=true
+MemoryAccounting=true
+TasksAccounting=true
+IOAccounting=true
+IPAccounting=true
+
 [Install]
 WantedBy=multi-user.target
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 345685a97..708d416a2 100644
--- a/sdk/deploy/argeo-init/usr/lib/systemd/user/argeo@.service
+++ b/sdk/deploy/argeo-init/usr/lib/systemd/user/argeo@.service
@@ -9,7 +9,10 @@ ConfigurationDirectory=argeo.d/%I
 CacheDirectory=argeo.d/%I
 #WorkingDirectory=
 
-ExecStart=java \
+Environment=JVM=java
+Environment=JVM_OPTS=
+
+ExecStart=${JVM} ${JVM_OPTS} \
 -Dosgi.configuration.cascaded=true \
 -Dosgi.sharedConfiguration.area=/etc/argeo.user.d/%I/ \
 -Dosgi.sharedConfiguration.area.readOnly=true \
-- 
2.30.2