Repository: karaf Updated Branches: refs/heads/karaf-3.0.x fb7c36c74 -> a560a0bbb
[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/a560a0bb Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a560a0bb Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a560a0bb Branch: refs/heads/karaf-3.0.x Commit: a560a0bbb569ae40cbc33612fc7fffaf0c9d96a7 Parents: fb7c36c Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Sep 1 18:09:45 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Sep 1 18:09:45 2014 +0200 ---------------------------------------------------------------------- .../resources/resources/etc/keys.properties | 2 +- .../etc/org.apache.karaf.management.cfg | 6 ---- .../resources/etc/org.apache.karaf.shell.cfg | 6 ---- .../etc/org.apache.karaf.webconsole.cfg | 32 ++++++++++++++++++++ .../resources/resources/etc/users.properties | 2 +- instance/core/pom.xml | 7 ----- .../etc/org.apache.karaf.management.cfg | 6 ---- .../resources/etc/org.apache.karaf.shell.cfg | 6 ---- .../resources/OSGI-INF/blueprint/webconsole.xml | 10 +----- 9 files changed, 35 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/a560a0bb/assemblies/features/framework/src/main/resources/resources/etc/keys.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/etc/keys.properties b/assemblies/features/framework/src/main/resources/resources/etc/keys.properties index ce006a1..05cb4c4 100644 --- a/assemblies/features/framework/src/main/resources/resources/etc/keys.properties +++ b/assemblies/features/framework/src/main/resources/resources/etc/keys.properties @@ -33,4 +33,4 @@ # The user guide describes how to generate/update the key. # #karaf=AAAAB3NzaC1kc3MAAACBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAAAAFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QAAAIEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoAAACBAKKSU2PFl/qOLxIwmBZPPIcJshVe7bVUpFvyl3BbJDow8rXfskl8wO63OzP/qLmcJM0+JbcRU/53JjTuyk31drV2qxhIOsLDC9dGCWj47Y7TyhPdXh/0dthTRBy6bqGtRPxGa7gJov1xm/UuYYXPIUR/3x9MAZvZ5xvE0kYXO+rx,_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/a560a0bb/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg index 16a0c08..5f86d83 100644 --- a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg +++ b/assemblies/features/framework/src/main/resources/resources/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/a560a0bb/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg index 5e33d01..19701fe 100644 --- a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg +++ b/assemblies/features/framework/src/main/resources/resources/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/a560a0bb/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/a560a0bb/assemblies/features/framework/src/main/resources/resources/etc/users.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/etc/users.properties b/assemblies/features/framework/src/main/resources/resources/etc/users.properties index 0ff30c8..1963b2f 100644 --- a/assemblies/features/framework/src/main/resources/resources/etc/users.properties +++ b/assemblies/features/framework/src/main/resources/resources/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/a560a0bb/instance/core/pom.xml ---------------------------------------------------------------------- diff --git a/instance/core/pom.xml b/instance/core/pom.xml index 429f77c..3691cad 100644 --- a/instance/core/pom.xml +++ b/instance/core/pom.xml @@ -128,13 +128,6 @@ <include>**/*.info</include> </includes> </resource> - <resource> - <directory>${project.basedir}/../../assemblies/features/framework/src/main/snapshot</directory> - <filtering>true</filtering> - <includes> - <include>**/*.cfg</include> - </includes> - </resource> </resources> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/karaf/blob/a560a0bb/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg ---------------------------------------------------------------------- diff --git a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg b/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg index 2b4854e..db54e98 100644 --- a/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.management.cfg +++ b/instance/core/src/main/resources/org/apache/karaf/instance/resources/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/a560a0bb/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 a61fef2..65a49f3 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 @@ -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/a560a0bb/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>
