Improve systemd deployment.

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 (file)
index 0000000..3b3be89
--- /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 bedaa364b45a85467bef1f90bdfae435fcfa6e52..b44fece2de13cf6f2eb3d65d938f563ceb5f8073 100644 (file)
--- 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 cbfd41ce373e594b4550d0f9452d78cd03cc9f15..be6566e342960ee82e448a1a46f0db39a99362c5 100644 (file)
--- 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 \