Improve systemd services

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