diff options
author | Lester Solbakken <lesters@yahoo-inc.com> | 2017-09-28 16:08:41 +0200 |
---|---|---|
committer | Lester Solbakken <lesters@yahoo-inc.com> | 2017-09-28 16:08:41 +0200 |
commit | fa1a4df3da32de18a56e72b4bd9fbc1f24b44693 (patch) | |
tree | 2847101a6a4480a7e508b1581635bd4ebd12765b /vespa-hadoop/src | |
parent | 92a3b3413b59cfec8911af9e9eb762c7a571b541 (diff) |
Add SSL configuration
Diffstat (limited to 'vespa-hadoop/src')
-rw-r--r-- | vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java | 2 | ||||
-rw-r--r-- | vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java index a227c4c10fb..db0fada990f 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java @@ -153,7 +153,7 @@ public class VespaRecordWriter extends RecordWriter { while (tokenizer.hasMoreTokens()) { String endpoint = tokenizer.nextToken().trim(); sessionParams.addCluster(new Cluster.Builder().addEndpoint( - Endpoint.create(endpoint, configuration.defaultPort(), false) + Endpoint.create(endpoint, configuration.defaultPort(), configuration.useSSL()) ).build()); } diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java index 79b7703032c..17c90061fc8 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java @@ -12,6 +12,7 @@ public class VespaConfiguration { public static final String ENDPOINT = "vespa.feed.endpoint"; public static final String DEFAULT_PORT = "vespa.feed.defaultport"; + public static final String USE_SSL = "vespa.feed.ssl"; public static final String PROXY_HOST = "vespa.feed.proxy.host"; public static final String PROXY_PORT = "vespa.feed.proxy.port"; public static final String DRYRUN = "vespa.feed.dryrun"; @@ -52,6 +53,11 @@ public class VespaConfiguration { } + public boolean useSSL() { + return getBoolean(USE_SSL, false); + } + + public String proxyHost() { return getString(PROXY_HOST); } |