From 4272b439fddbd6efa60ca3bc1a179bdd3dcd0af9 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Thu, 11 Oct 2018 12:25:41 -0400
Subject: [PATCH] Common Module - Add SSL to Kibana

---
 salt/common/nginx/nginx.conf.so-master | 4 ++--
 salt/kibana/etc/kibana.yml             | 3 +++
 salt/kibana/init.sls                   | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/salt/common/nginx/nginx.conf.so-master b/salt/common/nginx/nginx.conf.so-master
index 6b2b55871..357995431 100644
--- a/salt/common/nginx/nginx.conf.so-master
+++ b/salt/common/nginx/nginx.conf.so-master
@@ -84,7 +84,7 @@ http {
         #include /etc/nginx/default.d/*.conf;
 
         location / {
-            try_files $uri $uri.html index.html;
+            try_files $uri $uri.html /index.html;
         }
 
         location /app/kibana {
@@ -93,7 +93,7 @@ http {
           proxy_set_header Connection 'upgrade';
           proxy_set_header Host $host;
           proxy_cache_bypass $http_upgrade;
-          proxy_pass http://{{ masterip }}:5601/;
+          proxy_pass http://{{ masterip }}:5601/app/kibana;
         }
 
         error_page 404 /404.html;
diff --git a/salt/kibana/etc/kibana.yml b/salt/kibana/etc/kibana.yml
index 66dc3f412..1dd3dbb41 100644
--- a/salt/kibana/etc/kibana.yml
+++ b/salt/kibana/etc/kibana.yml
@@ -9,3 +9,6 @@ elasticsearch.url: http://172.17.0.9:9200
 #xpack.monitoring.ui.container.elasticsearch.enabled: true
 elasticsearch.requestTimeout: 90000
 logging.dest: /var/log/kibana/kibana.log
+ssl:
+  key: /etc/pki/server.key
+  cert: /etc/pki/serer.crt
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index 9095472bb..5e7d2889c 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -72,5 +72,7 @@ so-kibana:
       - /opt/so/log/kibana:/var/log/kibana:rw
       - /opt/so/conf/kibana/custdashboards:/usr/share/kibana/custdashboards:ro
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /etc/pki/masterssl.crt:/etc/pki/server.crt:ro
+      - /etc/pki/masterssl.key:/etc/pki/server.key:ro
     - port_bindings:
       - 0.0.0.0:5601:5601