Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F2A65200B72 for ; Fri, 26 Aug 2016 14:57:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F10BF160AB0; Fri, 26 Aug 2016 12:57:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1C158160AB6 for ; Fri, 26 Aug 2016 14:57:35 +0200 (CEST) Received: (qmail 46766 invoked by uid 500); 26 Aug 2016 12:57:35 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 46752 invoked by uid 99); 26 Aug 2016 12:57:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Aug 2016 12:57:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 048A9DFBA3; Fri, 26 Aug 2016 12:57:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: svet@apache.org To: commits@brooklyn.apache.org Date: Fri, 26 Aug 2016 12:57:35 -0000 Message-Id: <95023654370c42f99883f78b7ee90ef6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] brooklyn-dist git commit: Close public ports protected by the default credentials archived-at: Fri, 26 Aug 2016 12:57:37 -0000 Repository: brooklyn-dist Updated Branches: refs/heads/master d6a925145 -> 77cad55a6 Close public ports protected by the default credentials Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/d45be319 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/d45be319 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/d45be319 Branch: refs/heads/master Commit: d45be3194d4c7c60a51e3d2ba74885bdbbd25592 Parents: 8c2294a Author: Svetoslav Neykov Authored: Wed Aug 24 16:58:47 2016 +0300 Committer: Svetoslav Neykov Committed: Fri Aug 26 14:53:11 2016 +0300 ---------------------------------------------------------------------- .../resources/etc/org.apache.karaf.shell.cfg | 96 ++++++++++++++++++++ karaf/features/src/main/feature/feature.xml | 26 +++++- 2 files changed, 121 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d45be319/karaf/apache-brooklyn/src/main/resources/etc/org.apache.karaf.shell.cfg ---------------------------------------------------------------------- diff --git a/karaf/apache-brooklyn/src/main/resources/etc/org.apache.karaf.shell.cfg b/karaf/apache-brooklyn/src/main/resources/etc/org.apache.karaf.shell.cfg new file mode 100644 index 0000000..46017e2 --- /dev/null +++ b/karaf/apache-brooklyn/src/main/resources/etc/org.apache.karaf.shell.cfg @@ -0,0 +1,96 @@ +################################################################################ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +################################################################################ + +# +# These properties are used to configure Karaf's ssh shell. +# + +# +# Via sshPort and sshHost you define the address you can login into Karaf. +# +sshPort = 8101 +sshHost = 127.0.0.1 + +# +# 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 + +# +# 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.etc}/host.key + +# +# The format used for hostKey. +# Possible values are simple (Karaf internal), or PEM (OpenSSH format) +# +hostKeyFormat = simple + +# +# Role name used for SSH access authorization +# If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties +# +# sshRole = admin + +# +# Self defined key size in 1024, 2048, 3072, or 4096 +# If not set, this defaults to 4096. +# +# keySize = 4096 + +# +# Specify host key algorithm, defaults to RSA +# +# algorithm = RSA + +# +# Specify the client log level (default is WARN) +# 0: ERROR +# 1: WARN +# 2: INFO +# 3: DEBUG +# 4: TRACE +# +#logLevel=1 + +# +# Specify an additional welcome banner to be displayed when a user logs into the server. +# +# welcomeBanner = + +# +# 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 http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d45be319/karaf/features/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index 9e4b39b..2d89acf 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -21,6 +21,30 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0"> + + wrap + aries-blueprint + shell + shell-compat + feature + jaas + ssh + + + + bundle + config + deployer + diagnostic + feature + instance + kar + log + package + service + system + + mvn:javax.mail/mail/${javax.mail.version} @@ -32,7 +56,7 @@ - standard + brooklyn-standard-karaf brooklyn-guava-optional-deps brooklyn-core brooklyn-rest-resources