From 1b0f90b7e437115f17aeb2abe13a541740a9ef3c Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Fri, 7 Aug 2020 22:12:47 -0400
Subject: [PATCH] sync script

---
 .../files/scripts/{catrust.sh => so-catrust}         |  1 +
 salt/elasticsearch/init.sls                          | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 rename salt/elasticsearch/files/scripts/{catrust.sh => so-catrust} (98%)

diff --git a/salt/elasticsearch/files/scripts/catrust.sh b/salt/elasticsearch/files/scripts/so-catrust
similarity index 98%
rename from salt/elasticsearch/files/scripts/catrust.sh
rename to salt/elasticsearch/files/scripts/so-catrust
index 4ebdd6c88..fd43acff1 100644
--- a/salt/elasticsearch/files/scripts/catrust.sh
+++ b/salt/elasticsearch/files/scripts/so-catrust
@@ -17,6 +17,7 @@
 {%- set VERSION = salt['pillar.get']('global:soversion', '') %}
 {%- set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
 {%- set MANAGER = salt['grains.get']('master') %}
+. /usr/sbin/so-common
 # Check to see if we have extracted the ca cert.
 if [ ! -f /opt/so/saltstack/local/salt/common/cacerts ]; then
     docker run -v /etc/pki/ca.crt:/etc/pki/ca.crt --name so-elasticsearchca --user root --entrypoint keytool {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-logstash:{{ VERSION }} -keystore /etc/pki/ca-trust/extracted/java/cacerts -alias SOSCA -import -file /etc/pki/ca.crt -storepass changeit -noprompt
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index f3777481c..46bc32ec6 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -26,6 +26,7 @@
 {% if grains['role'] in ['so-eval','so-managersearch', 'so-manager', 'so-standalone'] %}
   {% set esclustername = salt['pillar.get']('manager:esclustername', '') %}
   {% set esheap = salt['pillar.get']('manager:esheap', '') %}
+  {% set ismanager = True %}
 {% elif grains['role'] in ['so-node','so-heavynode'] %}
   {% set esclustername = salt['pillar.get']('elasticsearch:esclustername', '') %}
   {% set esheap = salt['pillar.get']('elasticsearch:esheap', '') %}
@@ -37,6 +38,17 @@ vm.max_map_count:
   sysctl.present:
     - value: 262144
 
+{% if ismanager %}
+cascriptsync:
+  file.managed:
+    - name: /usr/sbin/so-catrust
+    - source: salt://elasticsearch/files/scripts/so-catrust
+    - user: 939
+    - group: 939
+    - mode: 750
+    
+{% endif %}
+
 # Add ES Group
 elasticsearchgroup:
   group.present: