CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-04-22 20:51:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

just use so-status.conf for containers to fix salt warning https://github.com/Security-Onion-Solutions/securityonion/issues/1681

Browse Source
This commit is contained in:
m0duspwnens
2020-11-11 11:38:48 -05:00
parent 15f243f0ce
commit 5a95159ec3
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
salt/common/init.sls
View File

@@ -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

4
salt/common/tools/sbin/so-status
View File

@@ -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 "#")
}