Improve deployment.

diff --git a/demo/cms-e4-rap.properties b/demo/cms-e4-rap.properties
index ab89af5bec672b16646e0294f4ebdf3e0a85cef5..1497d7cc94bc7b16334e48b2b87fbbc8620dd133 100644 (file)
--- a/demo/cms-e4-rap.properties
+++ b/demo/cms-e4-rap.properties
@@ -14,6 +14,7 @@ org.argeo.cms.e4.rap
 # Local
 argeo.node.repo.type=h2
 org.osgi.service.http.port=7070
+#org.eclipse.equinox.http.jetty.http.host=[IP address to listen to]
 #org.osgi.service.http.port.secure=7073
 #org.eclipse.equinox.http.jetty.websocket.enabled=true
 

diff --git a/dist/argeo-node/base/etc/argeo.d/config-template.ini b/dist/argeo-node/base/etc/argeo.d/config-template.ini
new file mode 100644 (file)
index 0000000..df880c6
--- /dev/null
+++ b/dist/argeo-node/base/etc/argeo.d/config-template.ini
@@ -0,0 +1,10 @@
+#argeo.osgi.start.6.apps=bundle1.to.start,bundle2.to.start
+
+#org.osgi.service.http.port=8080
+#org.eclipse.equinox.http.jetty.http.host=[IP address to listen to]
+#osgi.console=2323
+
+# Use centralised standard CMS config
+osgi.configuration.cascaded=true
+osgi.sharedConfiguration.area=/usr/share/argeo
+osgi.sharedConfiguration.area.readOnly=true

diff --git a/dist/argeo-node/base/etc/argeo.d/jvm.args b/dist/argeo-node/base/etc/argeo.d/jvm.args
index 3b3be897e50a30b4b675f6ccf5fdc1b5a4f379aa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/dist/argeo-node/base/etc/argeo.d/jvm.args
+++ b/dist/argeo-node/base/etc/argeo.d/jvm.args
@@ -1,3 +0,0 @@
--Dosgi.configuration.cascaded=true
--Dosgi.sharedConfiguration.area=/usr/share/argeo
--Dosgi.sharedConfiguration.area.readOnly=true

diff --git a/dist/argeo-node/base/etc/argeo.d/log4j.properties b/dist/argeo-node/base/etc/argeo.d/log4j.properties
new file mode 100644 (file)
index 0000000..cef8f33
--- /dev/null
+++ b/dist/argeo-node/base/etc/argeo.d/log4j.properties
@@ -0,0 +1,19 @@
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.djapps.on=DEBUG
+
+## Appenders
+# default appender
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yyyyMMdd HH:mm:ss} %-5p %m [%t] %c%n
+
+## File appender 
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.file=/var/log/argeo.d/<app>/node.log
+log4j.appender.file.MaxFileSize=20MB
+log4j.appender.file.MaxBackupIndex=8
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %m [%t] %p %n
\ No newline at end of file

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 be6566e342960ee82e448a1a46f0db39a99362c5..c2fc366ca69419b364e440b64bd8382a5e9dd30a 100644 (file)
--- a/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
+++ b/dist/argeo-node/rpm/usr/lib/systemd/system/argeo@.service
@@ -8,20 +8,23 @@ Type=simple
 StateDirectory=argeo.d/%I
 LogsDirectory=argeo.d/%I
 ConfigurationDirectory=argeo.d/%I
+CacheDirectory=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" \
+  -Dlog4j.configuration="file:/etc/argeo.d/log4j.properties" \
+  -Dosgi.configuration.cascaded=true \
+  -Dosgi.sharedConfiguration.area=/usr/share/argeo \
+  -Dosgi.sharedConfiguration.area.readOnly=true \
+  -Dargeo.node.repo.indexesBase=/var/cache/argeo.d/%I/indexes \
+  @/usr/share/osgi/boot/framework.args \
   @/etc/argeo.d/jvm.args \
   @/etc/argeo.d/%I/jvm.args \
-  @/usr/share/osgi/boot/framework.args \
   -configuration /var/lib/argeo.d/%I/state \
   -data /var/lib/argeo.d/%I/data
 #ExecReload=/usr/sbin/argeoctl reload %I
 # Exit codes of the JVM when SIGTERM or SIGINT have been caught:
 SuccessExitStatus=143 130
-#ExecStopPost=/usr/bin/cat "$EXIT_STATUS" > /var/lib/argeo.d/%I/state/EXIT_STATUS
 
 [Install]
 WantedBy=multi-user.target

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsPaths.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsPaths.java
index 452edc9cb555b88a0be7af0353f98ab8a4fac99c..ebdb92593e9046627b39ae882ed444c55cff8a53 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsPaths.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsPaths.java
@@ -2,6 +2,7 @@ package org.argeo.cms.internal.kernel;
 
 import java.nio.file.Path;
 
+/** Centralises access to the default node deployment directories. */
 public class CmsPaths {
        public static Path getRepoDirPath(String cn) {
                return KernelUtils.getOsgiInstancePath(KernelConstants.DIR_REPOS + '/' + cn);
@@ -11,7 +12,7 @@ public class CmsPaths {
                return KernelUtils.getOsgiInstancePath(KernelConstants.DIR_INDEXES);
        }
 
+       /** Singleton. */
        private CmsPaths() {
-
        }
 }