From a59b3899679ec052ad28333c55723b7b6b48d332 Mon Sep 17 00:00:00 2001 From: c-a-m Date: Tue, 18 Nov 2014 17:00:30 -0700 Subject: [PATCH] [TEST] Fixes the ssl configuration of the rest tests The rest tests were configured with transport and http settings for ssl. This changes that to the shield.ssl settings. Original commit: elastic/x-pack-elasticsearch@19b96f7fa332bd6de1bf70a547bbef8eafe929a1 --- .../org/elasticsearch/test/ShieldRestTests.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/elasticsearch/test/ShieldRestTests.java b/src/test/java/org/elasticsearch/test/ShieldRestTests.java index bee7579c5d4..7a0dc3d88ef 100644 --- a/src/test/java/org/elasticsearch/test/ShieldRestTests.java +++ b/src/test/java/org/elasticsearch/test/ShieldRestTests.java @@ -109,10 +109,10 @@ public class ShieldRestTests extends ElasticsearchRestTests { .put("shield.authz.store.files.roles", createFile(folder, "roles.yml", CONFIG_ROLE_ALLOW_ALL)) .put("shield.transport.n2n.ip_filter.file", createFile(folder, "ip_filter.yml", CONFIG_IPFILTER_ALLOW_ALL)) .put("shield.transport.ssl", ENABLE_TRANSPORT_SSL) - .put("shield.transport.ssl.keystore", store.getPath()) - .put("shield.transport.ssl.keystore_password", password) - .put("shield.transport.ssl.truststore", store.getPath()) - .put("shield.transport.ssl.truststore_password", password) + .put("shield.ssl.keystore", store.getPath()) + .put("shield.ssl.keystore_password", password) + .put("shield.ssl.truststore", store.getPath()) + .put("shield.ssl.truststore_password", password) .put("shield.http.ssl", false) .put("transport.tcp.port", BASE_PORT_RANGE) .putArray("discovery.zen.ping.unicast.hosts", "127.0.0.1:" + BASE_PORT, "127.0.0.1:" + (BASE_PORT + 1), "127.0.0.1:" + (BASE_PORT + 2), "127.0.0.1:" + (BASE_PORT + 3)) @@ -146,10 +146,10 @@ public class ShieldRestTests extends ElasticsearchRestTests { .put("node.mode", "network") .put("shield.transport.n2n.ip_filter.file", createFile(folder, "ip_filter.yml", CONFIG_IPFILTER_ALLOW_ALL)) .put("shield.transport.ssl", ENABLE_TRANSPORT_SSL) - .put("shield.transport.ssl.keystore", store.getPath()) - .put("shield.transport.ssl.keystore_password", password) - .put("shield.transport.ssl.truststore", store.getPath()) - .put("shield.transport.ssl.truststore_password", password) + .put("shield.ssl.keystore", store.getPath()) + .put("shield.ssl.keystore_password", password) + .put("shield.ssl.truststore", store.getPath()) + .put("shield.ssl.truststore_password", password) .put("cluster.name", internalCluster().getClusterName()) .build(); }