X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fserver%2Finit.sls;h=14cc9f8459a1c297b6cdf5085ea9809293afcc76;hp=36e93984db67701bec0c5c41e618164baf719a9b;hb=30c6becac6eae19ee467f6bfa7c72c153dd0a667;hpb=911588c0a9c69234b52e26a8c37cfc66e4e42762;ds=sidebyside

diff --git a/elasticsearch/server/init.sls b/elasticsearch/server/init.sls
index 36e9398..14cc9f8 100644
--- a/elasticsearch/server/init.sls
+++ b/elasticsearch/server/init.sls
@@ -27,12 +27,34 @@ elasticsearch_config:
   - require:
     - pkg: elasticsearch_packages
 
+elasticsearch_logging:
+  file.managed:
+  - name: /etc/elasticsearch/logging.yml
+  - source: salt://elasticsearch/files/logging.yml
+  - template: jinja
+  - require:
+    - pkg: elasticsearch_packages
+
+{%- if server.get('log', {}).logrotate|default(True) and not
+       salt['file.file_exists' ]('/etc/logrotate.d/elasticsearch') %}
+{#
+  Create logrotate config only if it doesn't already exist to avoid conflict
+  with logrotate formula or possibly package-shipped config
+#}
+elasticsearch_logrotate:
+  file.managed:
+  - name: /etc/logrotate.d/elasticsearch
+  - source: salt://elasticsearch/files/logrotate.conf
+  - template: jinja
+{%- endif %}
+
 elasticsearch_service:
   service.running:
   - enable: true
   - name: {{ server.service }}
   - watch:
     - file: elasticsearch_config
+    - file: elasticsearch_logging
     - file: elasticsearch_default
 
 {%- endif %}