From 6007a6c4d8373a239ccf1955a88391fc267e6785 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Mon, 10 Aug 2020 22:10:03 -0400
Subject: [PATCH] Things like this are why I hate Java

---
 salt/elasticsearch/files/elasticsearch.yml | 12 ++++++------
 salt/elasticsearch/init.sls                |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/salt/elasticsearch/files/elasticsearch.yml b/salt/elasticsearch/files/elasticsearch.yml
index f54195467..cb1526eba 100644
--- a/salt/elasticsearch/files/elasticsearch.yml
+++ b/salt/elasticsearch/files/elasticsearch.yml
@@ -27,12 +27,12 @@ cluster.routing.allocation.disk.watermark.flood_stage: 98%
 xpack.security.enabled: true
 xpack.security.http.ssl.enabled: true
 xpack.security.transport.ssl.enabled: true
-xpack.security.http.ssl.key: /etc/elasticsearch/elasticsearch.key
-xpack.security.http.ssl.certificate: /etc/elasticsearch/elasticsearch.crt
-xpack.security.http.ssl.certificate_authorities: /etc/elasticsearch/ca.crt
-xpack.security.transport.ssl.key: /etc/elasticsearch/elasticsearch.key
-xpack.security.transport.ssl.certificate: /etc/elasticsearch/elasticsearch.crt
-xpack.security.transport.ssl.certificate_authorities: /etc/elasticsearch/ca.crt
+xpack.security.http.ssl.key: /usr/share/elasticsearch/config/elasticsearch.key
+xpack.security.http.ssl.certificate: /usr/share/elasticsearch/config/elasticsearch.crt
+xpack.security.http.ssl.certificate_authorities: /usr/share/elasticsearch/config/ca.crt
+xpack.security.transport.ssl.key: /usr/share/elasticsearch/config/elasticsearch.key
+xpack.security.transport.ssl.certificate: /usr/share/elasticsearch/config/elasticsearch.crt
+xpack.security.transport.ssl.certificate_authorities: /usr/share/elasticsearch/config/ca.crt
 {%- endif %}
 node.attr.box_type: {{ NODE_ROUTE_TYPE }}
 node.name: {{ ESCLUSTERNAME }}
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 3d407f3fd..802957bd2 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -193,9 +193,9 @@ so-elasticsearch:
       - /opt/so/log/elasticsearch:/var/log/elasticsearch:rw
       - /opt/so/conf/ca/cacerts:/etc/pki/ca-trust/extracted/java/cacerts:ro
       {%- if FEATURES is sameas true %}
-      - /etc/pki/ca.crt:/etc/elasticsearch/ca.crt:ro
-      - /etc/pki/elasticsearch.key:/etc/elasticsearch/elasticsearch.key:ro
-      - /etc/pki/elasticsearch.crt:/etc/elasticsearch/elasticsearch.crt:ro
+      - /etc/pki/ca.crt:/usr/share/elasticsearch/config/ca.crt:ro
+      - /etc/pki/elasticsearch.key:/usr/share/elasticsearch/config/elasticsearch.key:ro
+      - /etc/pki/elasticsearch.crt:/usr/share/elasticsearch/config/elasticsearch.crt:ro
       {%- endif %}
     - watch:
       - file: cacertz