You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/21 16:58:18 UTC
git commit: [KARAF-2645] Fix contains of instances specific etc
configuration files
Updated Branches:
refs/heads/master 201b5544a -> ba320216f
[KARAF-2645] Fix contains of instances specific etc configuration files
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ba320216
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ba320216
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ba320216
Branch: refs/heads/master
Commit: ba320216ff4473e20e3e68af8f8ff94b582849c9
Parents: 201b554
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Dec 21 16:57:38 2013 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Dec 21 16:57:38 2013 +0100
----------------------------------------------------------------------
.../resources/resources/etc/system.properties | 4 +-
.../resources/etc/org.apache.karaf.shell.cfg | 33 ++++++++++---
.../instance/resources/etc/system.properties | 50 +++++++++++++-------
3 files changed, 60 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ba320216/assemblies/features/framework/src/main/resources/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/resources/resources/etc/system.properties b/assemblies/features/framework/src/main/resources/resources/etc/system.properties
index b1ee30e..e105d17 100644
--- a/assemblies/features/framework/src/main/resources/resources/etc/system.properties
+++ b/assemblies/features/framework/src/main/resources/resources/etc/system.properties
@@ -115,6 +115,6 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
# To enable OSGi security, uncomment the properties below,
# install the framework-security feature and restart.
#
-#java.security.policy=${karaf.home}/etc/all.policy
+#java.security.policy=${karaf.etc}/all.policy
#org.osgi.framework.security=osgi
-#org.osgi.framework.trust.repositories=${karaf.home}/etc/trustStore.ks
+#org.osgi.framework.trust.repositories=${karaf.etc}/trustStore.ks
http://git-wip-us.apache.org/repos/asf/karaf/blob/ba320216/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
----------------------------------------------------------------------
diff --git a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
index d94bbfd..077f5da 100644
--- a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
+++ b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg
@@ -24,33 +24,52 @@
#
# Via sshPort and sshHost you define the address you can login into Karaf.
#
-sshPort=${SUBST-SSH-PORT}
-sshHost=0.0.0.0
+sshPort = ${SUBST-SSH-PORT}
+sshHost = 0.0.0.0
+
+#
+# The sshIdleTimeout defines the inactivity timeout to logout the SSH session.
+# The sshIdleTimeout is in milliseconds, and the default is set to 30 minutes.
+#
+sshIdleTimeout = 1800000
#
# sshRealm defines which JAAS domain to use for password authentication.
#
-sshRealm=karaf
+sshRealm = karaf
#
# The location of the hostKey file defines where the private/public key of the server
# is located. If no file is at the defined location it will be ignored.
#
-hostKey=${karaf.base}/etc/host.key
+hostKey = ${karaf.etc}/host.key
#
# Role name used for SSH access authorization
# If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties
#
-# sshRole=admin
+# sshRole = admin
#
# Self defined key size in 1024, 2048, 3072, or 4096
# If not set, this defaults to 1024.
#
-# keySize=1024
+# keySize = 1024
#
# Specify host key algorithm, defaults to DSA
#
-# algorithm=DSA
+# algorithm = DSA
+
+#
+# Defines the completion mode on the Karaf shell console. The possible values are:
+# - GLOBAL: it's the same behavior as in previous Karaf releases. The completion displays all commands and all aliases
+# ignoring if you are in a subshell or not.
+# - FIRST: the completion displays all commands and all aliases only when you are not in a subshell. When you are
+# in a subshell, the completion displays only the commands local to the subshell.
+# - SUBSHELL: the completion displays only the subshells on the root level. When you are in a subshell, the completion
+# displays only the commands local to the subshell.
+# This property define the default value when you use the Karaf shell console.
+# You can change the completion mode directly in the shell console, using shell:completion command.
+#
+completionMode = GLOBAL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf/blob/ba320216/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
index 0f033e7..a683a34 100644
--- a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
+++ b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
@@ -28,45 +28,46 @@
# is not fully available.
# To change log levels, please refer to the org.ops4j.pax.logging.cfg file
# instead.
-org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+org.ops4j.pax.logging.DefaultServiceLog.level = ERROR
#
# Name of this Karaf instance.
#
-karaf.name=${SUBST-KARAF-NAME}
+karaf.name = ${SUBST-KARAF-NAME}
#
# Default repository where bundles will be loaded from before using
# other Maven repositories. For the full Maven configuration, see
# the org.ops4j.pax.url.mvn.cfg file.
#
-karaf.default.repository=system
+karaf.default.repository = system
#
# Location of a shell script that will be run when starting a shell
# session. This script can be used to create aliases and define
# additional commands.
#
-karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+karaf.shell.init.script = ${karaf.etc}/shell.init.script
#
# Sets the maximum size of the shell command history. If not set,
# defaults to 500 entries. Setting to 0 will disable history.
#
-# karaf.shell.history.maxSize=0
+# karaf.shell.history.maxSize = 0
#
# Deletes the entire karaf.data directory at every start
#
-karaf.clean.all=false
+karaf.clean.all = false
#
# Deletes the karaf.data/cache directory at every start
#
-karaf.clean.cache=false
+karaf.clean.cache = false
#
-# Default role name used for console authorization (JMX, SSH and WEB)
+# Roles to use when logging into a local Karaf console.
+#
# The syntax is the following:
# [classname:]principal
# where classname is the class name of the principal object
@@ -74,33 +75,46 @@ karaf.clean.cache=false
# and principal is the name of the principal of that class
# (defaults to instance).
#
-# Note that this value can be overriden using the various ConfigAdmin
-# configurations for JMX, SSH or the WebConsole.
-#
-karaf.admin.role=admin
+karaf.local.roles = admin,manager,viewer
#
# Set this empty property to avoid errors when validating xml documents.
#
-xml.catalog.files=
+xml.catalog.files =
#
# Suppress the bell in the console when hitting backspace too many times
# for example
#
-jline.nobell=true
+jline.nobell = true
#
# ServiceMix specs options
#
-org.apache.servicemix.specs.debug=false
-org.apache.servicemix.specs.timeout=100
+org.apache.servicemix.specs.debug = false
+org.apache.servicemix.specs.timeout = 100
#
# Settings for the OSGi 4.3 Weaving
# By default, we will not weave any classes. Change this setting to include classes
# that you application needs to have woven.
#
-org.apache.aries.proxy.weaving.enabled=none
+org.apache.aries.proxy.weaving.enabled = none
# Classes not to weave - Aries default + Xerces which is known to have issues.
-org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
+org.apache.aries.proxy.weaving.disabled = org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
+
+#
+# By default, only Karaf shell commands are secured, but additional services can be
+# secured by expanding this filter
+#
+karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
+
+#
+# Security properties
+#
+# To enable OSGi security, uncomment the properties below,
+# install the framework-security feature and restart.
+#
+#java.security.policy=${karaf.etc}/all.policy
+#org.osgi.framework.security=osgi
+#org.osgi.framework.trust.repositories=${karaf.etc}/trustStore.ks