From 2005069e6ccc8b9ca9068ab418d1f46e4c61f994 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 22 Sep 2020 13:56:41 +0200
Subject: [PATCH] Improve systemd deployment.

---
 dist/argeo-node/base/etc/argeo.d/jvm.args       |  3 +++
 dist/argeo-node/pom.xml                         | 17 +++++++++++++++--
 .../rpm/usr/lib/systemd/system/argeo@.service   |  3 ++-
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 dist/argeo-node/base/etc/argeo.d/jvm.args

diff --git a/dist/argeo-node/base/etc/argeo.d/jvm.args b/dist/argeo-node/base/etc/argeo.d/jvm.args
new file mode 100644
index 000000000..3b3be897e
--- /dev/null
+++ b/dist/argeo-node/base/etc/argeo.d/jvm.args
@@ -0,0 +1,3 @@
+-Dosgi.configuration.cascaded=true
+-Dosgi.sharedConfiguration.area=/usr/share/argeo
+-Dosgi.sharedConfiguration.area.readOnly=true
diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index bedaa364b..b44fece2d 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -85,7 +85,7 @@
 										<mapping>
 											<directory>/etc/argeo</directory>
 											<username>root</username>
-											<groupname>wheel</groupname>
+											<groupname>root</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
@@ -95,10 +95,23 @@
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/etc/argeo.d</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<configuration>noreplace</configuration>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>base/etc/argeo.d</location>
+												</source>
+											</sources>
+										</mapping>
 										<mapping>
 											<directory>/etc/argeo/conf.d</directory>
 											<username>root</username>
-											<groupname>wheel</groupname>
+											<groupname>root</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
diff --git a/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
index cbfd41ce3..be6566e34 100644
--- a/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
+++ b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
@@ -5,14 +5,15 @@ Wants=postgresql.service
 
 [Service]
 Type=simple
-DynamicUser=true
 StateDirectory=argeo.d/%I
 LogsDirectory=argeo.d/%I
 ConfigurationDirectory=argeo.d/%I
 WorkingDirectory=/var/lib/argeo.d/%I
+#User=%I
 
 ExecStart=/usr/lib/jvm/jre-11/bin/java \
   -Dlog4j.configuration="file:/etc/argeo.d/%I/log4j.properties" \
+  @/etc/argeo.d/jvm.args \
   @/etc/argeo.d/%I/jvm.args \
   @/usr/share/osgi/boot/framework.args \
   -configuration /var/lib/argeo.d/%I/state \
-- 
2.30.2