From 5a95159ec3305a45784ea4b156d2cec381b7d954 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 11 Nov 2020 11:38:48 -0500
Subject: [PATCH] just use so-status.conf for containers to fix salt warning
 https://github.com/Security-Onion-Solutions/securityonion/issues/1681

---
 salt/common/init.sls             |  5 -----
 salt/common/tools/sbin/so-status |  4 ++--
 salt/pcap/init.sls               | 16 ++++++++--------
 setup/so-setup                   |  1 -
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index bc66d8cf2..cf791cfa2 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -44,11 +44,6 @@ so-status.conf:
     - name: /opt/so/conf/so-status/so-status.conf
     - unless: ls /opt/so/conf/so-status/so-status.conf
 
-so-status.disabled.conf:
-  file.touch:
-    - name: /opt/so/conf/so-status/so-status.disabled.conf
-    - unless: ls /opt/so/conf/so-status/so-status.disabled.conf
-
 sosaltstackperms:
   file.directory:
     - name: /opt/so/saltstack
diff --git a/salt/common/tools/sbin/so-status b/salt/common/tools/sbin/so-status
index 9daf30a56..344db61c6 100755
--- a/salt/common/tools/sbin/so-status
+++ b/salt/common/tools/sbin/so-status
@@ -37,7 +37,7 @@ declare -a BAD_STATUSES=("removing" "paused" "exited" "dead")
 declare -a PENDING_STATUSES=("paused" "created" "restarting")
 declare -a GOOD_STATUSES=("running")
 declare -a DISABLED_CONTAINERS=()
-mapfile -t DISABLED_CONTAINERS < <(sort -u /opt/so/conf/so-status/so-status.disabled.conf)
+mapfile -t DISABLED_CONTAINERS < <(sort -u /opt/so/conf/so-status/so-status.conf | grep "^\s*#" | tr -d "#")
 
 
 declare -a temp_container_name_list=()
@@ -81,7 +81,7 @@ compare_lists() {
 
 create_expected_container_list() {
 
-    mapfile -t expected_container_list < <(sort -u /opt/so/conf/so-status/so-status.conf)    
+    mapfile -t expected_container_list < <(sort -u /opt/so/conf/so-status/so-status.conf | tr -d "#")    
 
 }
 
diff --git a/salt/pcap/init.sls b/salt/pcap/init.sls
index 0db9e7f61..5a13c1231 100644
--- a/salt/pcap/init.sls
+++ b/salt/pcap/init.sls
@@ -156,18 +156,18 @@ append_so-steno_so-status.conf:
   file.append:
     - name: /opt/so/conf/so-status/so-status.conf
     - text: so-steno
+    - unless: grep so-steno /opt/so/conf/so-status/so-status.conf
 
   {% if STENOOPTIONS.status == 'running' %}
 delete_so-steno_so-status.disabled:
-  file.line:
-    - name: /opt/so/conf/so-status/so-status.disabled.conf
-    - match: so-steno
-    - mode: delete
+  file.uncomment:
+    - name: /opt/so/conf/so-status/so-status.conf
+    - regex: ^so-steno$
   {% elif STENOOPTIONS.status == 'stopped' %}
-append_so-steno_so-status.disabled:
-  file.append:
-    - name: /opt/so/conf/so-status/so-status.disabled.conf
-    - text: so-steno
+so-steno_so-status.disabled:
+  file.comment:
+    - name: /opt/so/conf/so-status/so-status.conf
+    - regex: ^so-steno$
   {% endif %}
 
 so-sensoroni:
diff --git a/setup/so-setup b/setup/so-setup
index a39411a8f..fe69e8148 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -593,7 +593,6 @@ fi
 		# create these so the registry state can add so-registry to /opt/so/conf/so-status/so-status.conf
 		mkdir -p /opt/so/conf/so-status/
 		touch /opt/so/conf/so-status/so-status.conf
-		touch /opt/so/conf/so-status/so-status.disabled.conf
 
 		if [[ "$setup_type" == 'iso' ]]; then
 			set_progress_str 26 'Copying containers from iso'