CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Jinja2 templating comparisons

Browse Source
This commit is contained in:
William Wernert
2020-02-09 19:06:54 -05:00
parent d29cd1caee
commit 301ff77501
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pillar/docker/config.sls
View File

@@ -17,7 +17,7 @@ eval:
- so-idstools - so-idstools
- so-auth-api - so-auth-api
- so-auth-ui - so-auth-ui
{%- if OSQUERY != 0 %} {%- if OSQUERY != '0' %}
- so-mysql - so-mysql
- so-fleet - so-fleet
- so-redis - so-redis
@@ -30,23 +30,23 @@ eval:
- so-zeek - so-zeek
- so-curator - so-curator
- so-elastalert - so-elastalert
{%- if WAZUH != 0 %} {%- if WAZUH != '0' %}
- so-wazuh - so-wazuh
{%- endif %} {%- endif %}
- so-soctopus - so-soctopus
{%- if THEHIVE != 0 %} {%- if THEHIVE != '0' %}
- so-thehive - so-thehive
- so-thehive-es - so-thehive-es
- so-cortex - so-cortex
{%- endif %} {%- endif %}
{%- if PLAYBOOK != 0 %} {%- if PLAYBOOK != '0' %}
- so-playbook - so-playbook
- so-navigator - so-navigator
{%- endif %} {%- endif %}
{%- if FREQSERVER != 0 %} {%- if FREQSERVER != '0' %}
- so-freqserver - so-freqserver
{%- endif %} {%- endif %}
{%- if DOMAINSTATS != 0 %} {%- if DOMAINSTATS != '0' %}
- so-domainstats - so-domainstats
{%- endif %} {%- endif %}
heavy_node: heavy_node:
@@ -107,28 +107,28 @@ master_search:
- so-elastalert - so-elastalert
- so-filebeat - so-filebeat
- so-soctopus - so-soctopus
{%- if OSQUERY != 0 %} {%- if OSQUERY != '0' %}
- so-mysql - so-mysql
- so-fleet - so-fleet
- so-redis - so-redis
{%- endif %} {%- endif %}
{%- if WAZUH != 0 %} {%- if WAZUH != '0' %}
- so-wazuh - so-wazuh
{%- endif %} {%- endif %}
- so-soctopus - so-soctopus
{%- if THEHIVE != 0 %} {%- if THEHIVE != '0' %}
- so-thehive - so-thehive
- so-thehive-es - so-thehive-es
- so-cortex - so-cortex
{%- endif %} {%- endif %}
{%- if PLAYBOOK != 0 %} {%- if PLAYBOOK != '0' %}
- so-playbook - so-playbook
- so-navigator - so-navigator
{%- endif %} {%- endif %}
{%- if FREQSERVER != 0 %} {%- if FREQSERVER != '0' %}
- so-freqserver - so-freqserver
{%- endif %} {%- endif %}
{%- if DOMAINSTATS != 0 %} {%- if DOMAINSTATS != '0' %}
- so-domainstats - so-domainstats
{%- endif %} {%- endif %}
master: master:
@@ -149,28 +149,28 @@ master:
- so-kibana - so-kibana
- so-elastalert - so-elastalert
- so-filebeat - so-filebeat
{%- if OSQUERY != 0 %} {%- if OSQUERY != '0' %}
- so-mysql - so-mysql
- so-fleet - so-fleet
- so-redis - so-redis
{%- endif %} {%- endif %}
{%- if WAZUH != 0 %} {%- if WAZUH != '0' %}
- so-wazuh - so-wazuh
{%- endif %} {%- endif %}
- so-soctopus - so-soctopus
{%- if THEHIVE != 0 %} {%- if THEHIVE != '0' %}
- so-thehive - so-thehive
- so-thehive-es - so-thehive-es
- so-cortex - so-cortex
{%- endif %} {%- endif %}
{%- if PLAYBOOK != 0 %} {%- if PLAYBOOK != '0' %}
- so-playbook - so-playbook
- so-navigator - so-navigator
{%- endif %} {%- endif %}
{%- if FREQSERVER != 0 %} {%- if FREQSERVER != '0' %}
- so-freqserver - so-freqserver
{%- endif %} {%- endif %}
{%- if DOMAINSTATS != 0 %} {%- if DOMAINSTATS != '0' %}
- so-domainstats - so-domainstats
{%- endif %} {%- endif %}
parser_node: parser_node:
@@ -190,7 +190,7 @@ search_node:
- so-elasticsearch - so-elasticsearch
- so-curator - so-curator
- so-filebeat - so-filebeat
{%- if WAZUH != 0 %} {%- if WAZUH != '0' %}
- so-wazuh - so-wazuh
{%- endif %} {%- endif %}
sensor: sensor:
@@ -213,3 +213,4 @@ warm_node:
- so-influxdb - so-influxdb
- so-grafana - so-grafana
- so-elasticsearch - so-elasticsearch

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

@@ -191,7 +191,7 @@ main() {
printf "\n" printf "\n"
printf "${focus_color}%b\e[0m" "Checking container statuses\n\n" printf "${focus_color}%b\e[0m" "Checking container statuses\n\n"
local num_containers=${#docker_raw_list[@]} local num_containers=${#container_name_list[@]}
for i in $(seq 0 $(($num_containers - 1 ))); do for i in $(seq 0 $(($num_containers - 1 ))); do
print_line ${container_name_list[$i]} ${container_state_list[$i]} print_line ${container_name_list[$i]} ${container_state_list[$i]}