From eed3746ebcadf6f92f32a81b307bf7397b7db11e Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 12 Oct 2022 13:39:37 -0400
Subject: [PATCH] fix some globals

---
 salt/elasticsearch/init.sls              | 2 ++
 salt/elasticsearch/tools/sbin/so-catrust | 2 +-
 salt/soctopus/init.sls                   | 2 ++
 setup/so-functions                       | 5 ++---
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 7ec143089..c1610dfd6 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -30,6 +30,8 @@ cascriptsync:
     - group: 939
     - mode: 750
     - template: jinja
+    - defaults:
+        GLOBALS: {{ GLOBALS }}
 
 # Run the CA magic
 cascriptfun:
diff --git a/salt/elasticsearch/tools/sbin/so-catrust b/salt/elasticsearch/tools/sbin/so-catrust
index ae94fd286..aec97deeb 100644
--- a/salt/elasticsearch/tools/sbin/so-catrust
+++ b/salt/elasticsearch/tools/sbin/so-catrust
@@ -12,7 +12,7 @@ set -e
 
 # 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/ssl/ca.crt --name so-elasticsearchca --user root --entrypoint jdk/bin/keytool {{ GLOBALS.manager }}:5000/{{ GLOBALS.image_repo }}/so-elasticsearch:{{ GLOBALS.so_version }} -keystore /usr/share/elasticsearch/jdk/lib/security/cacerts -alias SOSCA -import -file /etc/ssl/ca.crt -storepass changeit -noprompt
+    docker run -v /etc/pki/ca.crt:/etc/ssl/ca.crt --name so-elasticsearchca --user root --entrypoint jdk/bin/keytool {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-elasticsearch:{{ GLOBALS.so_version }} -keystore /usr/share/elasticsearch/jdk/lib/security/cacerts -alias SOSCA -import -file /etc/ssl/ca.crt -storepass changeit -noprompt
     docker cp so-elasticsearchca:/usr/share/elasticsearch/jdk/lib/security/cacerts /opt/so/saltstack/local/salt/common/cacerts
     docker cp so-elasticsearchca:/etc/ssl/certs/ca-certificates.crt /opt/so/saltstack/local/salt/common/tls-ca-bundle.pem
     docker rm so-elasticsearchca
diff --git a/salt/soctopus/init.sls b/salt/soctopus/init.sls
index 74d7154cf..a2cba07ad 100644
--- a/salt/soctopus/init.sls
+++ b/salt/soctopus/init.sls
@@ -20,6 +20,8 @@ soctopus-sync:
     - user: 939
     - group: 939
     - template: jinja
+    - defaults:
+        GLOBALS: {{ GLOBALS }}
 
 soctopusconf:
   file.managed:
diff --git a/setup/so-functions b/setup/so-functions
index 7dfa7b047..1d0645791 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1444,8 +1444,7 @@ backup_pillar() {
 	touch $adv_backup_pillar_file
 	printf '%s\n'\
 		"backup:"\
-		"  locations:"\
-		"    - /opt/so/saltstack/local" > "$backup_pillar_file"
+		"  locations: []" > "$backup_pillar_file"
 }
 
 soctopus_pillar() {
@@ -2308,4 +2307,4 @@ wait_for_file() {
 
 wait_for_salt_minion() {
 	retry 60 5 "journalctl -u salt-minion.service | grep 'Minion is ready to receive requests'" >> "$setup_log" 2>&1 || exit 1
-}
\ No newline at end of file
+}