Remove reference to 'argeo' user.

diff --git a/dist/argeo-node/base/share/argeo/config.ini b/dist/argeo-node/base/share/argeo/config.ini
index 1a49ded8c8a78424152982b734c1ec8ad4322690..ae442054b3ee462a24b6b19bdb6b7b9836759cba 100644 (file)
--- 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 dbb96be9993829bcf9dc6c1c04cae68dc01b4cc2..250596db7dd08a06f1e1a97a883e0ea9d43007d7 100644 (file)
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
@@ -70,7 +72,7 @@
                                                                                <mapping>
                                                                                        <directory>/etc/argeo</directory>
                                                                                        <username>root</username>
-                                                                                       <groupname>argeo</groupname>
+                                                                                       <groupname>wheel</groupname>
                                                                                        <filemode>640</filemode>
                                                                                        <configuration>noreplace</configuration>
                                                                                        <directoryIncluded>false</directoryIncluded>
@@ -83,7 +85,7 @@
                                                                                <mapping>
                                                                                        <directory>/etc/argeo/conf.d</directory>
                                                                                        <username>root</username>
-                                                                                       <groupname>argeo</groupname>
+                                                                                       <groupname>wheel</groupname>
                                                                                        <filemode>640</filemode>
                                                                                        <configuration>noreplace</configuration>
                                                                                        <directoryIncluded>false</directoryIncluded>
@@ -143,9 +145,9 @@
                                                                                        </sources>
                                                                                </mapping>
                                                                        </mappings>
-                                                                       <preinstallScriptlet>
-                                                                               <scriptFile>rpm/scripts/preinstall</scriptFile>
-                                                                       </preinstallScriptlet>
+                                                                       <!-- <preinstallScriptlet> -->
+                                                                       <!-- <scriptFile>rpm/scripts/preinstall</scriptFile> -->
+                                                                       <!-- </preinstallScriptlet> -->
                                                                        <requires>
                                                                                <require>argeo-cms-node</require>
                                                                                <require>osgi-boot</require>

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 (file)
index 02aac6a..0000000
--- a/dist/argeo-node/rpm/etc/node/conf.d/app-template.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Rename to <my app>.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 (file)
index d53b851..0000000
--- 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 (file)
index 37cf1b4..0000000
--- 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 (file)
index 8141f04..0000000
--- 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 (file)
index 0000000..b83d222
--- /dev/null
+++ b/legacy/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/legacy/dep/.gitignore b/legacy/dep/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/legacy/dep/.gitignore
@@ -0,0 +1 @@
+/target/