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

Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev

Browse Source
This commit is contained in:
m0duspwnens
2020-04-09 15:08:52 -04:00
parent 2b05ae6c08 c0739976c9
commit d824b91c42
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
files/master
View File

@@ -12,6 +12,7 @@
# modified files cause conflicts, set verify_env to False. # modified files cause conflicts, set verify_env to False.
# user: socore # user: socore
log_file: /opt/so/log/salt/master
##### File Server settings ##### ##### File Server settings #####
########################################## ##########################################

4
salt/elasticsearch/init.sls
View File

@@ -145,7 +145,9 @@ so-elasticsearch-pipelines:
cmd.run: cmd.run:
- name: /opt/so/conf/elasticsearch/so-elasticsearch-pipelines {{ esclustername }} - name: /opt/so/conf/elasticsearch/so-elasticsearch-pipelines {{ esclustername }}
{% if grains['role'] == 'so-master' or grains['role'] == "so-eval" or grains['role'] == "so-mastersearch" %}
so-elasticsearch-templates: so-elasticsearch-templates:
cmd.run: cmd.run:
- name: /usr/sbin/so-elasticsearch-templates - name: /usr/sbin/so-elasticsearch-templates
- cwd: /opt/so - cwd: /opt/so
{% endif %}

4
salt/filebeat/etc/filebeat.yml
View File

@@ -111,7 +111,7 @@ filebeat.inputs:
clean_removed: false clean_removed: false
close_removed: false close_removed: false
{%- if STRELKAENABLED == '1' %} {%- if STRELKAENABLED == 1 %}
- type: log - type: log
paths: paths:
@@ -132,7 +132,7 @@ filebeat.inputs:
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- if WAZUHENABLED == '1' %} {%- if WAZUHENABLED == 1 %}
- type: log - type: log
paths: paths:

3
setup/so-functions
View File

@@ -325,7 +325,8 @@ configure_minion() {
echo "use_superseded:" >> /etc/salt/minion echo "use_superseded:" >> /etc/salt/minion
echo " - module.run" >> /etc/salt/minion echo " - module.run" >> /etc/salt/minion
echo "log_file: /opt/so/log/salt/minion" >> /etc/salt/minion
service salt-minion restart service salt-minion restart
} }