X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fserver%2Finit.sls;h=3421aea6644e692171c5daa924af696bea01c4a7;hp=ee984cbf11244c88d400269b9a23163cbbb4ad30;hb=c9a425c44772fd005591627fa12f39572c3eb53b;hpb=8af7028f8f2b9ed0622865b97ed29f991e4e42c4

diff --git a/elasticsearch/server/init.sls b/elasticsearch/server/init.sls
index ee984cb..3421aea 100644
--- a/elasticsearch/server/init.sls
+++ b/elasticsearch/server/init.sls
@@ -6,25 +6,51 @@ include:
   - elasticsearch.server.curator
 {%- endif %}
 
+elasticsearch_dependency_packages:
+  pkg.installed:
+  - names: {{ server.dependency_pkgs }}
+
 elasticsearch_packages:
   pkg.installed:
   - names: {{ server.pkgs }}
+  - require:
+    - pkg: elasticsearch_dependency_packages
+
+elasticsearch_group:
+  group.present:
+  - name: elasticsearch
+  - require:
+    - pkg: elasticsearch_packages
+
+elasticsearch_user:
+  user.present:
+  - name: elasticsearch
+  - home: /home/elasticsearch
+  - shell: /bin/false
+  - groups:
+    - elasticsearch
+  - require:
+    - group: elasticsearch_group
 
 elasticsearch_default:
   file.managed:
   - name: /etc/default/elasticsearch
   - source: salt://elasticsearch/files/v{{ server.version }}/elasticsearch
+  - group: elasticsearch
   - template: jinja
   - require:
     - pkg: elasticsearch_packages
+    - user: elasticsearch_user
 
 elasticsearch_config:
   file.managed:
   - name: /etc/elasticsearch/elasticsearch.yml
   - source: salt://elasticsearch/files/v{{ server.version }}/elasticsearch.yml
+  - group: elasticsearch
   - template: jinja
   - require:
     - pkg: elasticsearch_packages
+    - user: elasticsearch_user
 
 {%- if server.version == 2 %}
 elasticsearch_logging:
@@ -36,22 +62,26 @@ elasticsearch_logging:
     - pkg: elasticsearch_packages
 {%- endif %}
 
-{%- if server.version == 5 %}
+{%- if server.version in [5, 6] %}
 elasticsearch_logging:
   file.managed:
   - name: /etc/elasticsearch/log4j2.properties
-  - source: salt://elasticsearch/files/v5/log4j2.properties
+  - source: salt://elasticsearch/files/v{{ server.version }}/log4j2.properties
+  - group: elasticsearch
   - template: jinja
   - require:
     - pkg: elasticsearch_packages
+    - user: elasticsearch_user
 
 elasticsearch_jvm_options:
   file.managed:
   - name: /etc/elasticsearch/jvm.options
-  - source: salt://elasticsearch/files/v5/jvm.options
+  - source: salt://elasticsearch/files/v{{ server.version }}/jvm.options
+  - group: elasticsearch
   - template: jinja
   - require:
     - pkg: elasticsearch_packages
+    - user: elasticsearch_user
 
 {%- if grains.get('init') == 'systemd' %}
 elasticsearch_override_limit_memlock_file: