Cleanup docs
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b0431fa..611ae93 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,5 @@
elasticsearch-formula
-==============
+=====================
0.0.1 (2015-08-03)
diff --git a/README.rst b/README.rst
index c37299b..90df9be 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,10 @@
=============
-ElasticSearch
+Elasticsearch
=============
+Elasticsearch provides a distributed, multitenant-capable full-text search engine with a HTTP web interface and schema-free JSON documents.
+
Sample pillars
==============
@@ -19,6 +21,8 @@
Read more
=========
+
+* https://www.elastic.co/
* http://alex.nederlof.com/blog/2012/11/19/installing-elasticsearch-with-jenkins-on-ubuntu/
* http://websightdesigns.com/wiki/Setting_up_Centralized_Event_Parsing_on_Ubuntu_12.04
* https://gist.github.com/wingdspur/2026107
diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index 3c03785..392295f 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -1,13 +1,16 @@
-{% set server = salt['grains.filter_by']({
- 'Debian': {
- 'pkgs': ['elasticsearch'],
- 'service': 'elasticsearch',
- 'version': '1.4.4',
- },
- 'RedHat': {
- 'pkgs': ['elasticsearch'],
- 'service': 'elasticsearch',
- 'version': '1.4.4',
- },
-}, merge=salt['pillar.get']('elasticsearch:server')) %}
+
+{%- load_yaml as base_defaults %}
+Debian:
+ pkgs:
+ - elasticsearch
+ service: elasticsearch
+ version: '1.4.4'
+RedHat:
+ pkgs:
+ - elasticsearch
+ service: elasticsearch
+ version: '1.4.4'
+{%- endload %}
+
+{%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('elasticsearch:server')) %}
diff --git a/elasticsearch/meta/sphinx.yml b/elasticsearch/meta/sphinx.yml
index 09ac696..67866df 100644
--- a/elasticsearch/meta/sphinx.yml
+++ b/elasticsearch/meta/sphinx.yml
@@ -1,6 +1,6 @@
doc:
- name: Elastic Search
- description: It provides a distributed, multitenant-capable full-text search engine with a HTTP web interface and schema-free JSON documents.
+ name: Elasticsearch
+ description: Elasticsearch provides a distributed, multitenant-capable full-text search engine with a HTTP web interface and schema-free JSON documents.
role:
{%- if pillar.elasticsearch.server is defined %}
server:
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 2d39640..2dd8332 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -1,5 +1,7 @@
applications:
- elasticsearch
+classes:
+- service.elasticsearch.support
parameters:
elasticsearch:
server: