CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-05-04 10:28:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
m0duspwnens
2021-05-25 17:16:44 -04:00
parent dfaf40f583 543154f037
commit ecf7e25a51
71 changed files with 5 additions and 2281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salt/filebeat/init.sls
+2 -2
View File
@@ -80,7 +80,7 @@ filebeatmoduleconfsync:
sodefaults_module_conf:
file.managed:
- name: /opt/so/conf/filebeat/etc/securityonion.yml
- name: /opt/so/conf/filebeat/modules/securityonion.yml
- source: salt://filebeat/etc/module_config.yml.jinja
- template: jinja
- defaults:
@@ -88,7 +88,7 @@ sodefaults_module_conf:
thirdparty_module_conf:
file.managed:
- name: /opt/so/conf/filebeat/etc/thirdparty.yml
- name: /opt/so/conf/filebeat/modules/thirdparty.yml
- source: salt://filebeat/etc/module_config.yml.jinja
- template: jinja
- defaults: