Repository: karaf Updated Branches: refs/heads/karaf-2.x 58c6081fd -> 85e79246a
[KARAF-3176] Cleanup sshRole and jmxRole and provisiong the etc/org.apache.karaf.webconsole.cfg with webconsole role Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/85e79246 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/85e79246 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/85e79246 Branch: refs/heads/karaf-2.x Commit: 85e79246aa71d9e831317bfb34200085f877b560 Parents: 58c6081 Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Mon Sep 1 18:09:45 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Mon Sep 8 17:36:16 2014 +0200 ---------------------------------------------------------------------- .../admin/etc/org.apache.karaf.management.cfg | 6 ---- .../karaf/admin/etc/org.apache.karaf.shell.cfg | 6 ---- .../text/etc/org.apache.karaf.management.cfg | 6 ---- .../text/etc/org.apache.karaf.shell.cfg | 6 ---- .../main/distribution/text/etc/users.properties | 2 +- .../etc/org.apache.karaf.webconsole.cfg | 32 ++++++++++++++++++++ .../resources/OSGI-INF/blueprint/webconsole.xml | 10 +----- 7 files changed, 34 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/85e79246/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.management.cfg ---------------------------------------------------------------------- diff --git a/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.management.cfg b/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.management.cfg index 2b4854e..db54e98 100644 --- a/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.management.cfg +++ b/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.management.cfg @@ -65,9 +65,3 @@ threaded = true # The ObjectName used to register the JMXConnectorServer # objectName = connector:name=rmi - -# -# Role name used for JMX access authorization -# If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties -# -# jmxRole=admin http://git-wip-us.apache.org/repos/asf/karaf/blob/85e79246/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg ---------------------------------------------------------------------- diff --git a/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg b/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg index 5c2fd78..48fa8b5 100644 --- a/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg +++ b/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg @@ -45,12 +45,6 @@ sshRealm = karaf 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 - -# # Self defined key size in 1024, 2048, 3072, or 4096 # If not set, this defaults to 1024. # http://git-wip-us.apache.org/repos/asf/karaf/blob/85e79246/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg b/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg index 16a0c08..5f86d83 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg @@ -65,9 +65,3 @@ threaded = true # The ObjectName used to register the JMXConnectorServer # objectName = connector:name=rmi - -# -# Role name used for JMX access authorization -# If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties -# -# jmxRole=admin http://git-wip-us.apache.org/repos/asf/karaf/blob/85e79246/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg b/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg index 159c740..1142b2b 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg @@ -45,12 +45,6 @@ sshRealm = karaf 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 - -# # Self defined key size in 1024, 2048, 3072, or 4096 # If not set, this defaults to 1024. # http://git-wip-us.apache.org/repos/asf/karaf/blob/85e79246/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties b/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties index 0ff30c8..1963b2f 100644 --- a/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties +++ b/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties @@ -30,4 +30,4 @@ # with the name "karaf". # karaf = karaf,_g_:admingroup -_g_\:admingroup = group,admin,manager,viewer +_g_\:admingroup = group,admin,manager,viewer,webconsole http://git-wip-us.apache.org/repos/asf/karaf/blob/85e79246/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.webconsole.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.webconsole.cfg b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.webconsole.cfg new file mode 100644 index 0000000..55abefd --- /dev/null +++ b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.webconsole.cfg @@ -0,0 +1,32 @@ +################################################################################ +# +# 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. +# +################################################################################ + +# +# This properties file defines the configuration of the Karaf WebConsole. +# + +# +# realm defines which JAAS domain to use for password authentication +# +realm=karaf + +# +# role defines the user role allowed to login and use the Karaf WebConsole +# +role=webconsole \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf/blob/85e79246/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml ---------------------------------------------------------------------- diff --git a/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml b/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml index cf5abad..548a0f0 100644 --- a/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml +++ b/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml @@ -19,20 +19,12 @@ --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"; - xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"; default-activation="lazy"> - <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"> - <ext:default-properties> - <ext:property name="karaf.admin.role" value="admin" /> - </ext:default-properties> - </ext:property-placeholder> - - <cm:property-placeholder persistent-id="org.apache.karaf.webconsole"> <cm:default-properties> <cm:property name="realm" value="karaf"/> - <cm:property name="role" value="$[karaf.admin.role]"/> + <cm:property name="role" value="admin"/> </cm:default-properties> </cm:property-placeholder>
