From 8e6b382cfdcef01e4c8dcd13709df0fad0f3b35a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 17 Dec 2019 11:16:02 +0100 Subject: [PATCH] Remove reference to 'argeo' user. --- dist/argeo-node/base/share/argeo/config.ini | 3 ++ dist/argeo-node/pom.xml | 14 +++++---- .../rpm/etc/node/conf.d/app-template.txt | 7 ----- dist/argeo-node/rpm/etc/node/log4j.properties | 15 ---------- dist/argeo-node/rpm/etc/node/node.ini | 29 ------------------- dist/argeo-node/rpm/etc/node/settings.sh | 3 -- legacy/.gitignore | 1 + legacy/dep/.gitignore | 1 + 8 files changed, 13 insertions(+), 60 deletions(-) delete mode 100644 dist/argeo-node/rpm/etc/node/conf.d/app-template.txt delete mode 100644 dist/argeo-node/rpm/etc/node/log4j.properties delete mode 100644 dist/argeo-node/rpm/etc/node/node.ini delete mode 100644 dist/argeo-node/rpm/etc/node/settings.sh create mode 100644 legacy/.gitignore create mode 100644 legacy/dep/.gitignore diff --git a/dist/argeo-node/base/share/argeo/config.ini b/dist/argeo-node/base/share/argeo/config.ini index 1a49ded8c..ae442054b 100644 --- a/dist/argeo-node/base/share/argeo/config.ini +++ b/dist/argeo-node/base/share/argeo/config.ini @@ -1,6 +1,9 @@ # Only Argeo OSGi Boot is explicitly started osgi.bundles=org.argeo.osgi.boot@start +# Only clean state is currently fully supported +osgi.clean=true + # Required standard bundles to start argeo.osgi.start.2.node=\ org.eclipse.equinox.http.servlet,\ diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml index dbb96be99..250596db7 100644 --- a/dist/argeo-node/pom.xml +++ b/dist/argeo-node/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.argeo.commons @@ -70,7 +72,7 @@ /etc/argeo root - argeo + wheel 640 noreplace false @@ -83,7 +85,7 @@ /etc/argeo/conf.d root - argeo + wheel 640 noreplace false @@ -143,9 +145,9 @@ - - rpm/scripts/preinstall - + + + argeo-cms-node osgi-boot diff --git a/dist/argeo-node/rpm/etc/node/conf.d/app-template.txt b/dist/argeo-node/rpm/etc/node/conf.d/app-template.txt deleted file mode 100644 index 02aac6a82..000000000 --- a/dist/argeo-node/rpm/etc/node/conf.d/app-template.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Rename to .ini - -# Backend -#argeo.osgi.start.5.apps=org.argeo.suite.apps - -# UI -#argeo.osgi.start.6.apps=org.argeo.suite.apps.web,org.argeo.suite.workbench.rap diff --git a/dist/argeo-node/rpm/etc/node/log4j.properties b/dist/argeo-node/rpm/etc/node/log4j.properties deleted file mode 100644 index d53b851de..000000000 --- a/dist/argeo-node/rpm/etc/node/log4j.properties +++ /dev/null @@ -1,15 +0,0 @@ -log4j.rootLogger=WARN, console, file - -log4j.logger.org.argeo=INFO - -## Appenders -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%-5p %m%n - -log4j.appender.file=org.apache.log4j.DailyRollingFileAppender -log4j.appender.file.File=/var/log/node/node.csv -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{ISO8601};"%m";%c;%p%n -log4j.appender.file.bufferedIO=true -log4j.appender.file.immediateFlush=false diff --git a/dist/argeo-node/rpm/etc/node/node.ini b/dist/argeo-node/rpm/etc/node/node.ini deleted file mode 100644 index 37cf1b4cb..000000000 --- a/dist/argeo-node/rpm/etc/node/node.ini +++ /dev/null @@ -1,29 +0,0 @@ -## Provisioning -#osgi.clean=true -#argeo.osgi.bundles=\ -#/etc/node/modules;in=*/*,\ -#/usr/local/share/osgi;in=**/*.jar,\ -#/usr/share/osgi;in=**/*.jar;ex=boot/*.jar - -## HTTP server -org.osgi.service.http.port=8080 - -## System management -osgi.console=2323 - -## Standalone -#argeo.node.useradmin.uris=dc=example,dc=com.ldif -#argeo.node.repo.type=h2 - -## Deployed -#argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@localhost/dc=example,dc=com -#argeo.node.repo.type=postgresql -#argeo.node.repo.dburl=jdbc:postgresql://localhost/node -#argeo.node.repo.dbuser=argeo -#argeo.node.repo.dbpassword=argeo - -## Complex user configuration examples -#argeo.node.useradmin.uris="dc=example,dc=com.ldif dc=example,dc=org.ldif" -#argeo.node.useradmin.uris="ldap://uid=admin,ou=system:secret@localhost:10389\ -#/dc=example,dc=com?userBase=ou=users&groupBase=ou=groups dc=example,dc=org.ldif" - diff --git a/dist/argeo-node/rpm/etc/node/settings.sh b/dist/argeo-node/rpm/etc/node/settings.sh deleted file mode 100644 index 8141f0495..000000000 --- a/dist/argeo-node/rpm/etc/node/settings.sh +++ /dev/null @@ -1,3 +0,0 @@ -export LANG=en_US.utf8 -JAVA_OPTS="-showversion -Xmx128m" -#JAVA_OPTS="-showversion -Xmx512m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=7084 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" diff --git a/legacy/.gitignore b/legacy/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/legacy/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/legacy/dep/.gitignore b/legacy/dep/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/legacy/dep/.gitignore @@ -0,0 +1 @@ +/target/ -- 2.30.2