[KARAF-3882] Add hostKeyFormat property in etc/org.apache.karaf.shell.cfg file
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/21873254 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/21873254 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/21873254 Branch: refs/heads/master Commit: 2187325447b745cbcd62c21fc6aeb76747748956 Parents: d45cc2b Author: Jean-Baptiste Onofré <[email protected]> Authored: Sat Aug 22 09:04:44 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sat Aug 22 09:04:44 2015 +0200 ---------------------------------------------------------------------- .../main/resources/resources/etc/org.apache.karaf.shell.cfg | 6 ++++++ .../karaf/instance/resources/etc/org.apache.karaf.shell.cfg | 6 ++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/21873254/assemblies/features/base/src/main/resources/resources/etc/org.apache.karaf.shell.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/resources/resources/etc/org.apache.karaf.shell.cfg b/assemblies/features/base/src/main/resources/resources/etc/org.apache.karaf.shell.cfg index 047d701..de4b163 100644 --- a/assemblies/features/base/src/main/resources/resources/etc/org.apache.karaf.shell.cfg +++ b/assemblies/features/base/src/main/resources/resources/etc/org.apache.karaf.shell.cfg @@ -45,6 +45,12 @@ sshRealm = karaf 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 # http://git-wip-us.apache.org/repos/asf/karaf/blob/21873254/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg ---------------------------------------------------------------------- diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg index 047e3ea..b3cee3d 100644 --- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg +++ b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.shell.cfg @@ -45,6 +45,12 @@ sshRealm = karaf 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 #
