From 321122cc8794ff5ba43827484bdc1f2c1028732e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 7 Aug 2020 22:43:34 -0400 Subject: [PATCH] update logstash --- salt/elasticsearch/init.sls | 1 - salt/logstash/init.sls | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls index adf82a286..e0a8b0a94 100644 --- a/salt/elasticsearch/init.sls +++ b/salt/elasticsearch/init.sls @@ -180,7 +180,6 @@ so-elasticsearch: - /nsm/elasticsearch:/usr/share/elasticsearch/data:rw - /opt/so/log/elasticsearch:/var/log/elasticsearch:rw - /opt/so/conf/ca/cacerts:/etc/pki/ca-trust/extracted/java/cacerts:ro - - watch: - file: cacertz diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls index 1fa5b0e86..6cdecbc47 100644 --- a/salt/logstash/init.sls +++ b/salt/logstash/init.sls @@ -148,7 +148,6 @@ so-logstash: - user: logstash - environment: - LS_JAVA_OPTS=-Xms{{ lsheap }} -Xmx{{ lsheap }} - - SSL_CERT_FILE=/etc/ssl/certs/ca.crt - port_bindings: {% for BINDING in DOCKER_OPTIONS.port_bindings %} - {{ BINDING }} @@ -167,7 +166,7 @@ so-logstash: - /etc/pki/filebeat.crt:/usr/share/logstash/filebeat.crt:ro - /etc/pki/filebeat.p8:/usr/share/logstash/filebeat.key:ro - /etc/pki/ca.crt:/usr/share/filebeat/ca.crt:ro - - /etc/ssl/certs/intca.crt:/etc/ssl/certs/ca.crt:ro + - /opt/so/conf/ca/cacerts:/etc/pki/ca-trust/extracted/java/cacerts:ro {%- if grains['role'] == 'so-eval' %} - /nsm/zeek:/nsm/zeek:ro - /nsm/suricata:/suricata:ro