X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=sdk%2Fdeploy%2Fargeo-init%2Fusr%2Flib%2Fsystemd%2Fsystem%2Fargeo%40.service;h=1bdf8c8277c9e5eafcadf8b202e2f00c01b734e9;hb=f08e1285ad0fe508126e946eff8216dae5f288f4;hp=ddea4a5b7a351bb4835e6891a0648eaa6d46377b;hpb=b6ee9c8baa2650ebbca59c9f24eac3599408bf7f;p=lgpl%2Fargeo-commons.git

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 ddea4a5b7..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,29 +11,31 @@ ConfigurationDirectory=argeo.d/%I
 CacheDirectory=argeo.d/%I
 WorkingDirectory=/var/lib/argeo.d/%I
 
-ExecStart=/usr/lib/jvm/java-17-openjdk-amd64/bin/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=/etc/argeo.d/%I/ \
 -Dosgi.sharedConfiguration.area.readOnly=true \
--Dosgi.configuration.area=/var/lib/argeo.d/%I/state \
--Dosgi.instance.area=/var/lib/argeo.d/%I/data \
--Dargeo.node.repo.indexesBase=/var/cache/argeo.d/%I/indexes \
--Dorg.osgi.framework.system.packages.extra=\
-com.sun.net.httpserver,\
-com.sun.jndi.ldap,\
-com.sun.jndi.ldap.sasl,\
-com.sun.jndi.dns,\
-com.sun.security.jgss,\
-com.sun.nio.file,\
-com.sun.nio.sctp \
+-Dosgi.configuration.area=${STATE_DIRECTORY}/state/ \
+-Dosgi.instance.area=${STATE_DIRECTORY}/data/ \
+-Dargeo.node.repo.indexesBase=${CACHE_DIRECTORY}/indexes \
 -Declipse.ignoreApp=true \
 -Dosgi.noShutdown=true \
 -Dorg.eclipse.equinox.http.jetty.autostart=false \
 @/etc/argeo.d/jvm.args \
-@/etc/argeo.d/%I/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