commit f441217b688566c455e06d4adcde2dab89bf04b7
author Jan Kaufman <j.kaufman@tcpcloud.eu> Thu Mar 10 12:50:38 2016 +0100
committer Jan Kaufman <j.kaufman@tcpcloud.eu> Thu Mar 10 12:50:38 2016 +0100
tree 79e95a99ada8cdbab568fff21d6ecc90fc251377
parent c509c903f7b77539f5deb8385b60e77db1f058d8
parent 35dfb5a1c7c09cc6fbb762f7b5dfb40327638719

Merge branch 'configpath' into 'master'

Make Configpath variable

- make /opt/kibana/config/kibana.yml default as it is in upstream package
- provide option to set user specified path (eg.: when custom kibana package is used)

See merge request !2

README.rst

diff --git a/README.rst b/README.rst
index 98b9c76..89c289f 100644
--- a/README.rst
+++ b/README.rst
@@ -22,12 +22,13 @@
           host: localhost
           port: 9200
 
-Or without adding elasticsearch kibana repository
+Or without adding elasticsearch kibana repository, but with modified path to config file
 
 .. code-block:: yaml
 
     kibana:
       server:
+        configpath: /usr/share/kibana/config/kibana.yml
         enabled: true
         bind:
           address: 0.0.0.0

kibana/map.jinja

diff --git a/kibana/map.jinja b/kibana/map.jinja
index a6736e3..cedacb3 100644
--- a/kibana/map.jinja
+++ b/kibana/map.jinja
@@ -3,5 +3,6 @@
     'Debian': {
         'pkgname': 'kibana',
         'service': 'kibana',
+        'configpath': '/opt/kibana/config/kibana.yml',
     },
 }, merge=salt['pillar.get']('kibana:server')) %}

kibana/server.sls

diff --git a/kibana/server.sls b/kibana/server.sls
index d07185f..0fd6a55 100644
--- a/kibana/server.sls
+++ b/kibana/server.sls
@@ -22,7 +22,7 @@
   - enable: true
   - name: {{ server.service }}
   - watch:
-    - file: /usr/share/kibana/config/kibana.yml
+    - file: {{ server.configpath }}
 
 /usr/share/kibana/config/kibana.yml:
   file.managed:

tests/pillar/kibana_server.sls

diff --git a/tests/pillar/kibana_server.sls b/tests/pillar/kibana_server.sls
index dadbbb6..ad8ad52 100644
--- a/tests/pillar/kibana_server.sls
+++ b/tests/pillar/kibana_server.sls
@@ -1,5 +1,6 @@
 kibana:
   server:
+    configpath: /usr/share/kibana/config/kibana.yml
     enabled: true
     bind:
       address: 0.0.0.0