From bcc91634f2cbe2bb09af874908351e2ef997423b Mon Sep 17 00:00:00 2001 From: Joe Stewart Date: Wed, 13 Jul 2016 14:30:19 -0500 Subject: [PATCH 1/3] Add elasticsearch to installed extras --- default.config.yml | 2 ++ provisioning/playbook.yml | 3 ++- provisioning/requirements.yml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/default.config.yml b/default.config.yml index 53d267c3a..0dc4c70e5 100644 --- a/default.config.yml +++ b/default.config.yml @@ -174,6 +174,7 @@ installed_extras: - adminer # - blackfire - drupalconsole + # - elasticsearch - mailhog # - memcached # - newrelic @@ -209,6 +210,7 @@ firewall_allowed_tcp_ports: - "8080" - "8443" - "8983" + - "9200" firewall_log_dropped_packets: false # PHP Configuration. Currently-supported versions: 5.6, 7.0. diff --git a/provisioning/playbook.yml b/provisioning/playbook.yml index df50ee94c..9f11e7d14 100644 --- a/provisioning/playbook.yml +++ b/provisioning/playbook.yml @@ -68,9 +68,10 @@ - { role: geerlingguy.redis, when: '"redis" in installed_extras' } - { role: geerlingguy.php-redis, when: '"redis" in installed_extras' } - { role: geerlingguy.ruby, when: '"ruby" in installed_extras' } - - { role: geerlingguy.java, when: '"solr" in installed_extras or "selenium" in installed_extras' } + - { role: geerlingguy.java, when: '"solr" in installed_extras or "selenium" in installed_extras or "elasticsearch" in installed_extras'} - { role: arknoll.selenium, when: '"selenium" in installed_extras' } - { role: geerlingguy.solr, when: '"solr" in installed_extras' } + - { role: geerlingguy.elasticsearch, when: '"elasticsearch" in installed_extras' } - { role: geerlingguy.varnish, when: '"varnish" in installed_extras' } # Roles for security and stability on production. diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml index bc6902166..5fb548db8 100644 --- a/provisioning/requirements.yml +++ b/provisioning/requirements.yml @@ -19,6 +19,8 @@ version: 1.0.7 - src: geerlingguy.drush version: 1.1.2 +- src: geerlingguy.elasticsearch + version: 2.0.1 - src: geerlingguy.firewall version: 1.0.9 - src: geerlingguy.git From 94a50800b82374f9a1ab44324647d6055a18b1f8 Mon Sep 17 00:00:00 2001 From: Joe Stewart Date: Fri, 15 Jul 2016 06:26:14 -0500 Subject: [PATCH 2/3] Add doc page and install version 2.1.0 of elasticsearch role. --- docs/extras/elasticsearch.md | 24 ++++++++++++++++++++++++ provisioning/requirements.yml | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 docs/extras/elasticsearch.md diff --git a/docs/extras/elasticsearch.md b/docs/extras/elasticsearch.md new file mode 100644 index 000000000..8a7d98cb5 --- /dev/null +++ b/docs/extras/elasticsearch.md @@ -0,0 +1,24 @@ +[Elasticsearch](https://www.elastic.co/products/elasticsearch) is a search engine based on Lucene. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents. + + To enable Elasticsearch in Drupal VM just make sure `elasticsearch` is in the list of `installed_extras` in your `config.yml`, and when you build Drupal VM, the latest version of Elasticsearch will be installed. + +The URL to connect to the local elasticsearch server (assuming you're using the default `elasticsearch_http_port` of 9200) from Drupal is: + + http://localhost:9200 + +To access Elasticsearch from the host computer requires changing the IP address to listen on a specific interface, or 0.0.0.0 to listen on all interfaces. + + elasticsearch_network_host: 0.0.0.0 + +The Elasticsearch server can then be accessed at the configured domain: + + http://drupalvm.dev:9200 + +## Elasticsearch configuration + +You can add configuration for Elasticsearch by setting the appropriate variables inside `config.yml` before you build Drupal VM. + + elasticsearch_network_host: localhost + elasticsearch_http_port: 9200 + +Consult the [geerlingguy.elasticsearch](https://github.com/geerlingguy/ansible-role-elasticsearch) role for additional variables available for configuration. diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml index 5fb548db8..6c1172e86 100644 --- a/provisioning/requirements.yml +++ b/provisioning/requirements.yml @@ -20,7 +20,7 @@ - src: geerlingguy.drush version: 1.1.2 - src: geerlingguy.elasticsearch - version: 2.0.1 + version: 2.1.0 - src: geerlingguy.firewall version: 1.0.9 - src: geerlingguy.git From 69706ef39f27faa3e404272cc7077d270f172703 Mon Sep 17 00:00:00 2001 From: Joe Stewart Date: Fri, 15 Jul 2016 06:28:43 -0500 Subject: [PATCH 3/3] Add Elasticsearch as optionally installed in README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4c810f07e..a11feb3cb 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ It will install the following on an Ubuntu 16.04 (by default) linux VM: - Drupal Console - Varnish 4.x (configurable) - Apache Solr 4.10.x (configurable) + - Elasticsearch - Node.js 0.12 (configurable) - Selenium, for testing your sites via Behat - Ruby