From 61ff944087edd51d51ef29305713ed03c71c1b0e Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Tue, 4 Aug 2020 18:18:06 -0400
Subject: [PATCH] add tmp to survive restarts

---
 salt/logstash/init.sls                                         | 2 +-
 salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja | 1 +
 setup/so-setup                                                 | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index b63c1ce96..85590673d 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -127,7 +127,7 @@ importdir:
 # Create the logstash data directory
 nsmlsdir:
   file.directory:
-    - name: /nsm/logstash
+    - name: /nsm/logstash/tmp
     - user: 931
     - group: 939
     - makedirs: True
diff --git a/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja b/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja
index 060f42daf..0d8efa4c4 100644
--- a/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja
+++ b/salt/logstash/pipelines/config/so/9998_output_minio.conf.jinja
@@ -10,6 +10,7 @@ output {
         size_file => 2048
         time_file => 1
         codec => json
+        temporary_directory => "/usr/share/logstash/data/tmp"
         additional_settings => {
             "force_path_style" => true
             }
diff --git a/setup/so-setup b/setup/so-setup
index 7335b5acc..7f127fc57 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -429,6 +429,7 @@ fi
 		update_sudoers >> $setup_log 2>&1
 		
 		set_progress_str 12 'Generating manager global pillar'
+		minio_generate_keys
 		manager_global >> $setup_log 2>&1
 		
 		set_progress_str 13 'Generating manager pillar'