CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-04-25 14:07:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix globals order

Browse Source
This commit is contained in:
Mike Reeves
2023-04-26 15:54:16 -04:00
parent be003f7ee4
commit e799edaf49
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pillar/top.sls
+2 -20
View File
@@ -1,5 +1,7 @@
base: base:
'*': '*':
- global.soc_global
- global.adv_global
- docker.soc_docker - docker.soc_docker
- docker.adv_docker - docker.adv_docker
- influxdb.token - influxdb.token
@@ -27,8 +29,6 @@ base:
- kibana.secrets - kibana.secrets
{% endif %} {% endif %}
- secrets - secrets
- global.soc_global
- global.adv_global
- manager.soc_manager - manager.soc_manager
- manager.adv_manager - manager.adv_manager
- idstools.soc_idstools - idstools.soc_idstools
@@ -64,8 +64,6 @@ base:
'*_sensor': '*_sensor':
- healthcheck.sensor - healthcheck.sensor
- global.soc_global
- global.adv_global
- strelka.soc_strelka - strelka.soc_strelka
- strelka.adv_strelka - strelka.adv_strelka
- zeek.soc_zeek - zeek.soc_zeek
@@ -89,8 +87,6 @@ base:
{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %} {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
- kibana.secrets - kibana.secrets
{% endif %} {% endif %}
- global.soc_global
- global.adv_global
- kratos.soc_kratos - kratos.soc_kratos
- elasticsearch.soc_elasticsearch - elasticsearch.soc_elasticsearch
- elasticsearch.adv_elasticsearch - elasticsearch.adv_elasticsearch
@@ -144,8 +140,6 @@ base:
{% endif %} {% endif %}
- secrets - secrets
- healthcheck.standalone - healthcheck.standalone
- global.soc_global
- global.adv_global
- idstools.soc_idstools - idstools.soc_idstools
- idstools.adv_idstools - idstools.adv_idstools
- kratos.soc_kratos - kratos.soc_kratos
@@ -191,8 +185,6 @@ base:
- elasticsearch.adv_elasticsearch - elasticsearch.adv_elasticsearch
- curator.soc_curator - curator.soc_curator
- curator.adv_curator - curator.adv_curator
- global.soc_global
- global.adv_global
- redis.soc_redis - redis.soc_redis
- redis.adv_redis - redis.adv_redis
- zeek.soc_zeek - zeek.soc_zeek
@@ -209,8 +201,6 @@ base:
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
'*_idh': '*_idh':
- global.soc_global
- global.adv_global
- idh.soc_idh - idh.soc_idh
- idh.adv_idh - idh.adv_idh
- minions.{{ grains.id }} - minions.{{ grains.id }}
@@ -224,8 +214,6 @@ base:
{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %} {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %}
- elasticsearch.auth - elasticsearch.auth
{% endif %} {% endif %}
- global.soc_global
- global.adv_global
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
@@ -237,8 +225,6 @@ base:
{% endif %} {% endif %}
- redis.soc_redis - redis.soc_redis
- redis.adv_redis - redis.adv_redis
- global.soc_global
- global.adv_global
- minions.{{ grains.id }} - minions.{{ grains.id }}
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
@@ -264,8 +250,6 @@ base:
- soctopus.adv_soctopus - soctopus.adv_soctopus
- curator.soc_curator - curator.soc_curator
- curator.adv_curator - curator.adv_curator
- global.soc_global
- global.adv_global
- backup.soc_backup - backup.soc_backup
- backup.adv_backup - backup.adv_backup
- kratos.soc_kratos - kratos.soc_kratos
@@ -290,8 +274,6 @@ base:
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
'*_fleet': '*_fleet':
- global.soc_global
- global.adv_global
- backup.soc_backup - backup.soc_backup
- backup.adv_backup - backup.adv_backup
- logstash.soc_logstash - logstash.soc_logstash