From fd36c758b77bf9e63e1820313664c1ba4135f202 Mon Sep 17 00:00:00 2001 From: c-a-m Date: Thu, 22 Jan 2015 16:01:59 -0700 Subject: [PATCH] test: updated esvm for marvel and license plugins This updates .esvmrc to get the latest license plugin, marvel, and reflects the latest configuration. This sets the bind host and publish host to 127.0.0.1 so that hostname verification succeeds. Original commit: elastic/x-pack-elasticsearch@a51046d130e10d3630c1b9840669bf969df6a604 --- dev-tools/esvm/.esvmrc | 34 +++++++++++++++++++++++----------- dev-tools/esvm/readme.txt | 10 +++++----- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dev-tools/esvm/.esvmrc b/dev-tools/esvm/.esvmrc index 5ab0373086c..43b01b9fcae 100644 --- a/dev-tools/esvm/.esvmrc +++ b/dev-tools/esvm/.esvmrc @@ -2,8 +2,9 @@ "defaults": { "plugins": [ "lmenezes/elasticsearch-kopf", - { "name": "shield", "path" : "file:../../target/releases/elasticsearch-shield-1.0.0-SNAPSHOT.zip" }, - { "name": "license", "path" : "file:/Users//.m2/repository/org/elasticsearch/elasticsearch-license-plugin/1.0.0-beta1/elasticsearch-license-plugin-1.0.0-beta1.jar" } + "elasticsearch/elasticsearch-license/latest", + "elasticsearch/marvel/latest", + { "name": "shield", "path" : "file:../../target/releases/elasticsearch-shield-1.0.0-SNAPSHOT.zip" } ], "config" : { "cluster.name": "shield", @@ -12,15 +13,27 @@ "type": "zen", "zen.ping" : { "multicast.enabled": false, - "unicast.hosts": [ "localhost:9300", "localhost:9301" ] + "unicast.hosts": [ "127.0.0.1:9300", "127.0.0.1:9301" ] } }, + "network": { + "bind_host": "127.0.0.1", + "publish_host": "127.0.0.1" + }, + "marvel.agent.exporter.es.hosts": [ "https://admin-plain:changeme@127.0.0.1:9200"], + "marvel.agent.exporter.es.ssl.truststore.path": "../../src/test/resources/org/elasticsearch/shield/transport/ssl/certs/simple/testnode.jks", + "marvel.agent.exporter.es.ssl.truststore.password": "testnode", + "http.cors": { + "enabled": true, + "allow-origin": "/http:\/\/www.elasticsearch.(org|com)/" + }, "shield": { "enabled": true, "system_key.file": ".esvm-shield-config/system_key", "audit.enabled": true, "transport.ssl": true, "http.ssl": true, + "ssl.hostname_verification": true, "ssl.keystore": { "path": "../../src/test/resources/org/elasticsearch/shield/transport/ssl/certs/simple/testnode.jks", "password": "testnode" @@ -51,12 +64,10 @@ "order": 1, "url": "ldaps://54.200.235.244:636", "user_dn_templates": ["uid={0},ou=people,dc=oldap,dc=test,dc=elasticsearch,dc=com"], - "group_search.group_search_dn": "ou=people,dc=oldap,dc=test,dc=elasticsearch,dc=com", - "group_search.subtree_search": false, - "unmapped_groups_as_roles": "false", - "files": { - "role_mapping": ".esvm-shield-config/role_mapping.yml" - } + "group_search.base_dn": "ou=people,dc=oldap,dc=test,dc=elasticsearch,dc=com", + "unmapped_groups_as_roles": false, + "hostname_verification": false, + "files.role_mapping": ".esvm-shield-config/role_mapping.yml" } } }, @@ -68,8 +79,9 @@ "order": 1, "domain_name": "ad.test.elasticsearch.com", "url": "ldaps://ad.test.elasticsearch.com:636", - "unmapped_groups_as_roles": "false", - "files": {"role_mapping": ".esvm-shield-config/role_mapping.yml"} + "unmapped_groups_as_roles": false, + "hostname_verification": false, + "files.role_mapping": ".esvm-shield-config/role_mapping.yml" } } } diff --git a/dev-tools/esvm/readme.txt b/dev-tools/esvm/readme.txt index 3460871b88a..46e7cfe61d9 100644 --- a/dev-tools/esvm/readme.txt +++ b/dev-tools/esvm/readme.txt @@ -5,12 +5,12 @@ npm install esvm -g Running: 1) cd to elasticsearch-shield/dev-tools/esvm -2) modify the elasticsearch-license plugin directory in .esvmrc file -3-a) For native users -./esvm -3-b) For openldap users +2) run esvm +a) For native users +esvm +b) For openldap users esvm oldap -3-c) For active directory users +c) For active directory users esvm ad Users and roles are stored in .esvm-shield-config