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 2019/06/20 08:40:36 UTC
[karaf] branch karaf-4.2.x updated: Remove SSH hostKeyFormat from
the config file
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 2d862f0 Remove SSH hostKeyFormat from the config file
2d862f0 is described below
commit 2d862f0bf5b5d65292eef98fdd921972b93b32b1
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 19 20:35:43 2019 +0100
Remove SSH hostKeyFormat from the config file
---
assemblies/features/standard/src/main/feature/feature.xml | 6 ------
itests/test/src/test/filtered-resources/etc/feature.xml | 6 ------
.../src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java | 1 -
3 files changed, 13 deletions(-)
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index b779316..9648856 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -293,12 +293,6 @@ sftpEnabled=true
hostKey = ${karaf.etc}/host.key
#
-# The format used for hostKey.
-# Possible values are simple (Karaf internal), or PEM (OpenSSH format)
-#
-hostKeyFormat = simple
-
-#
# Self defined key size in 1024, 2048, 3072, or 4096
# If not set, this defaults to 2048.
#
diff --git a/itests/test/src/test/filtered-resources/etc/feature.xml b/itests/test/src/test/filtered-resources/etc/feature.xml
index 3354723..f55ac6a 100644
--- a/itests/test/src/test/filtered-resources/etc/feature.xml
+++ b/itests/test/src/test/filtered-resources/etc/feature.xml
@@ -184,12 +184,6 @@
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
#
# sshRole = admin
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java b/itests/test/src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java
index a07b567..210b86a 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/ssh/SshKeyFormatTest.java
@@ -50,7 +50,6 @@ public class SshKeyFormatTest extends SshCommandTestBase {
File keyFile = new File("src/test/resources/org/apache/karaf/itests/ssh/test.pem");
return options(composite(super.config()),
editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "hostKey", keyFile.getAbsolutePath()),
- editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "hostKeyFormat", "PEM"),
bundle("mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.not-yet-commons-ssl/0.3.11_1"),
bundle("mvn:com.google.guava/guava/16.0.1")
);