From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 14 Nov 2012 13:39:20 +0000 (+0000)
Subject: Improve config.ini
X-Git-Tag: argeo-slc-2.1.7~539
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=d74b640f4f1cf633681a09d416440e291b50357c;p=gpl%2Fargeo-slc.git

Improve config.ini

git-svn-id: https://svn.argeo.org/slc/trunk@5804 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/dist/slc/src/main/rpm/etc/slc/config.ini b/dist/slc/src/main/rpm/etc/slc/config.ini
index 275fbe87e..33b5e8da2 100644
--- a/dist/slc/src/main/rpm/etc/slc/config.ini
+++ b/dist/slc/src/main/rpm/etc/slc/config.ini
@@ -1,53 +1,44 @@
+# SLC SERVICES
+argeo.osgi.start.1.slc=\
+org.argeo.server.ads.server,\
+
+argeo.osgi.start.2.slc=\
+org.argeo.slc.node.jackrabbit,\
+org.argeo.slc.support.maven,\
+org.argeo.slc.server.repo,\
+org.argeo.slc.agent,\
+org.argeo.slc.agent.jcr,\
+
+argeo.osgi.start.3.slc=\
+org.argeo.slc.server.repo.webapp,\
+
+# NODE SERVICES
 argeo.osgi.start.1.node=\
 org.springframework.osgi.extender,\
-org.argeo.server.ads.server,\
 
-argeo.osgi.start.3.node=\
+argeo.osgi.start.2.node=\
 org.argeo.node.repo.jackrabbit,\
 org.argeo.security.dao.ldap,\
 
-argeo.osgi.start.4.node=\
+argeo.osgi.start.3.node=\
 org.argeo.jackrabbit.webapp,\
 org.argeo.server.rap.webapp,\
 org.argeo.dep.osgi.catalina.start,\
 org.eclipse.equinox.http.registry,\
 org.springframework.osgi.web.extender,\
 
-argeo.osgi.start.3.slc=\
-org.argeo.slc.node.jackrabbit,\
-org.argeo.slc.support.maven,\
-org.argeo.slc.server.repo,\
-org.argeo.slc.agent,\
-org.argeo.slc.agent.jcr,\
-
-argeo.osgi.start.4.slc=\
-org.argeo.slc.server.repo.webapp,\
-
-#argeo.osgi.start=\
-#org.springframework.osgi.extender,\
-#org.argeo.server.ads.server,\
-#org.argeo.node.repo.jackrabbit,\
-#org.argeo.security.dao.ldap,\
-#org.argeo.jackrabbit.webapp,\
-#org.argeo.server.rap.webapp,\
-#org.argeo.dep.osgi.catalina.start,\
-#org.eclipse.equinox.http.registry,\
-#org.springframework.osgi.web.extender,\
-#org.argeo.slc.node.jackrabbit,\
-#org.argeo.slc.support.maven,\
-#org.argeo.slc.server.repo,\
-#org.argeo.slc.server.repo.webapp,\
-#org.argeo.slc.agent,\
-#org.argeo.slc.agent.jcr,\
-
+# CONFIGURATION
 org.argeo.security.ui.initialPerspective=org.argeo.security.ui.userHomePerspective
 
+# Note default URL to access the webapp
+# http://localhost:7080/ui/node
+
 # TOMCAT PORTS
 argeo.server.port.http=7080
 argeo.server.port.https=7083
 argeo.server.port.ajp=7089
 
-# LDAP (Apache DS)
+# LDAP (Apache DS, not started by default)
 argeo.ldap.port=7081
 #argeo.ads.init.ldif=osgibundle:init-argeo.ldif
 org.osgi.framework.bootdelegation=com.sun.jndi.ldap
@@ -63,8 +54,7 @@ osgi.noShutdown=true
 osgi.bundles=org.argeo.osgi.boot.jar@start
 argeo.osgi.bundles=\
 /etc/slc/modules;in=*,\
-/usr/share/slc/lib;in=*.jar,\
 /usr/share/osgi;in=*.jar,\
 /usr/share/eclipse-rap;in=*.jar,\
 /usr/share/osgi/eclipse;in=*.jar,\
-/usr/share/osgi/rap;in=*.jar,\
+/usr/share/osgi/rap;in=*.jar,\
\ No newline at end of file