You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/07/01 12:40:03 UTC
[2/6] git commit: OS-independent path for default private key
locations
OS-independent path for default private key locations
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/351111ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/351111ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/351111ca
Branch: refs/heads/master
Commit: 351111ca1a02b65684c9bbf8d0e7dc7b6498f7c0
Parents: b8f1a04
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Jun 30 15:40:40 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Jul 1 10:33:58 2014 +0300
----------------------------------------------------------------------
.../main/java/brooklyn/location/basic/LocationConfigKeys.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/351111ca/core/src/main/java/brooklyn/location/basic/LocationConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/basic/LocationConfigKeys.java b/core/src/main/java/brooklyn/location/basic/LocationConfigKeys.java
index eeb070d..1a77f27 100644
--- a/core/src/main/java/brooklyn/location/basic/LocationConfigKeys.java
+++ b/core/src/main/java/brooklyn/location/basic/LocationConfigKeys.java
@@ -1,10 +1,12 @@
package brooklyn.location.basic;
+import java.io.File;
import java.util.Set;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.event.basic.BasicConfigKey;
+import brooklyn.util.os.Os;
import com.google.common.base.CaseFormat;
import com.google.common.reflect.TypeToken;
@@ -36,7 +38,8 @@ public class LocationConfigKeys {
public static final ConfigKey<String> PASSWORD = ConfigKeys.newStringConfigKey("password");
public static final ConfigKey<String> PUBLIC_KEY_FILE = ConfigKeys.newStringConfigKey("publicKeyFile", "colon-separated list of ssh public key file(s) to use; if blank will infer from privateKeyFile by appending \".pub\"");
public static final ConfigKey<String> PUBLIC_KEY_DATA = ConfigKeys.newStringConfigKey("publicKeyData", "ssh public key string to use (takes precedence over publicKeyFile)");
- public static final ConfigKey<String> PRIVATE_KEY_FILE = ConfigKeys.newStringConfigKey("privateKeyFile", "colon-separated list of ssh private key files; uses first in list that can be read", "~/.ssh/id_rsa:~/.ssh/id_dsa");
+ public static final ConfigKey<String> PRIVATE_KEY_FILE = ConfigKeys.newStringConfigKey("privateKeyFile", "colon-separated list of ssh private key files; uses first in list that can be read",
+ Os.fromHome(".ssh/id_rsa") + File.pathSeparator + Os.fromHome(".ssh/id_dsa"));
public static final ConfigKey<String> PRIVATE_KEY_DATA = ConfigKeys.newStringConfigKey("privateKeyData", "ssh private key string to use (takes precedence over privateKeyFile)");
public static final ConfigKey<String> PRIVATE_KEY_PASSPHRASE = ConfigKeys.newStringConfigKey("privateKeyPassphrase");