From cd0b9bbe4a679acc5c384f23915283d61fb9e9df Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 13 Aug 2021 16:19:41 -0400
Subject: [PATCH 1/2] dont always add curator to so-status

---
 salt/curator/init.sls  | 6 ++++--
 salt/curator/map.jinja | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/salt/curator/init.sls b/salt/curator/init.sls
index 35d5b2f1b..aa360c0d4 100644
--- a/salt/curator/init.sls
+++ b/salt/curator/init.sls
@@ -140,22 +140,24 @@ so-curator:
     - force: True
   {% endif %}
 
+  {% if CURATOROPTIONS.manage_so-status %}
 append_so-curator_so-status.conf:
   file.append:
     - name: /opt/so/conf/so-status/so-status.conf
     - text: so-curator
     - unless: grep -q so-curator /opt/so/conf/so-status/so-status.conf
 
-  {% if not CURATOROPTIONS.start %}
+    {% if not CURATOROPTIONS.start %}
 so-curator_so-status.disabled:
   file.comment:
     - name: /opt/so/conf/so-status/so-status.conf
     - regex: ^so-curator$
-  {% else %}
+    {% else %}
 delete_so-curator_so-status.disabled:
   file.uncomment:
     - name: /opt/so/conf/so-status/so-status.conf
     - regex: ^so-curator$
+    {% endif %}
   {% endif %}
 
 # Begin Curator Cron Jobs
diff --git a/salt/curator/map.jinja b/salt/curator/map.jinja
index e67587cae..8796050eb 100644
--- a/salt/curator/map.jinja
+++ b/salt/curator/map.jinja
@@ -1,11 +1,15 @@
 {% set CURATOROPTIONS = {} %}
 {% set ENABLED = salt['pillar.get']('curator:enabled', True) %}
 {% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
+{% do CURATOROPTIONS.update({'manage_so-status': True}) %}
 
 # don't start the docker container if searchnode and true clustering is enabled or curator disabled via pillar or true cluster not enabled and manager
 {% if not ENABLED or (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %}
   {% do CURATOROPTIONS.update({'start': False}) %}
   {% do CURATOROPTIONS.update({'status': 'absent'}) %}
+  {% if (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %}
+    {% do CURATOROPTIONS.update({'manage_so-status': False}) %}
+  {% endif %}%}
 {% else %}
   {% do CURATOROPTIONS.update({'start': True}) %}
   {% do CURATOROPTIONS.update({'status': 'running'}) %}

From 4955b552df564b9fa78653d7bd9ce738ac7f1ebc Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 13 Aug 2021 17:42:37 -0400
Subject: [PATCH 2/2] remove -

---
 salt/curator/init.sls  | 2 +-
 salt/curator/map.jinja | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/salt/curator/init.sls b/salt/curator/init.sls
index aa360c0d4..144864b44 100644
--- a/salt/curator/init.sls
+++ b/salt/curator/init.sls
@@ -140,7 +140,7 @@ so-curator:
     - force: True
   {% endif %}
 
-  {% if CURATOROPTIONS.manage_so-status %}
+  {% if CURATOROPTIONS.manage_sostatus %}
 append_so-curator_so-status.conf:
   file.append:
     - name: /opt/so/conf/so-status/so-status.conf
diff --git a/salt/curator/map.jinja b/salt/curator/map.jinja
index 8796050eb..9b4a75a96 100644
--- a/salt/curator/map.jinja
+++ b/salt/curator/map.jinja
@@ -1,14 +1,14 @@
 {% set CURATOROPTIONS = {} %}
 {% set ENABLED = salt['pillar.get']('curator:enabled', True) %}
 {% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
-{% do CURATOROPTIONS.update({'manage_so-status': True}) %}
+{% do CURATOROPTIONS.update({'manage_sostatus': True}) %}
 
 # don't start the docker container if searchnode and true clustering is enabled or curator disabled via pillar or true cluster not enabled and manager
 {% if not ENABLED or (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %}
   {% do CURATOROPTIONS.update({'start': False}) %}
   {% do CURATOROPTIONS.update({'status': 'absent'}) %}
   {% if (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %}
-    {% do CURATOROPTIONS.update({'manage_so-status': False}) %}
+    {% do CURATOROPTIONS.update({'manage_sostatus': False}) %}
   {% endif %}%}
 {% else %}
   {% do CURATOROPTIONS.update({'start': True}) %}