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 dupe ids

Browse Source
This commit is contained in:
m0duspwnens
2021-10-22 14:26:04 -04:00
parent f61400680d
commit 9f6407fcb0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/filebeat/init.sls
View File

@@ -141,7 +141,7 @@ so-filebeat:
- file: filebeatconf - file: filebeatconf
- file: filebeatmoduleconf - file: filebeatmoduleconf
- file: filebeatmoduledir - file: filebeatmoduledir
- x509: filebeat_crt - x509: conf_filebeat_crt
- x509: conf_filebeat_key - x509: conf_filebeat_key
- x509: trusttheca - x509: trusttheca

2
salt/logstash/init.sls
View File

@@ -200,7 +200,7 @@ so-logstash:
- file: es_template_{{TEMPLATE.split('.')[0] | replace("/","_") }} - file: es_template_{{TEMPLATE.split('.')[0] | replace("/","_") }}
{% endfor %} {% endfor %}
- require: - require:
- x509: filebeat_crt - x509: etc_filebeat_crt
{% if grains['role'] == 'so-heavynode' %} {% if grains['role'] == 'so-heavynode' %}
- x509: trusttheca - x509: trusttheca
{% else %} {% else %}

8
salt/ssl/init.sls
View File

@@ -174,7 +174,7 @@ etc_filebeat_key:
- new: True - new: True
{% if salt['file.file_exists']('/etc/pki/filebeat.key') -%} {% if salt['file.file_exists']('/etc/pki/filebeat.key') -%}
- prereq: - prereq:
- x509: /etc/pki/filebeat.crt - x509: etc_filebeat_crt
{%- endif %} {%- endif %}
- timeout: 30 - timeout: 30
- retry: - retry:
@@ -182,7 +182,7 @@ etc_filebeat_key:
interval: 30 interval: 30
# Request a cert and drop it where it needs to go to be distributed # Request a cert and drop it where it needs to go to be distributed
filebeat_crt: etc_filebeat_crt:
x509.certificate_managed: x509.certificate_managed:
- name: /etc/pki/filebeat.crt - name: /etc/pki/filebeat.crt
- ca_server: {{ ca_server }} - ca_server: {{ ca_server }}
@@ -493,7 +493,7 @@ conf_filebeat_key:
- new: True - new: True
{% if salt['file.file_exists']('/opt/so/conf/filebeat/etc/pki/filebeat.key') -%} {% if salt['file.file_exists']('/opt/so/conf/filebeat/etc/pki/filebeat.key') -%}
- prereq: - prereq:
- x509: filebeat_crt - x509: conf_filebeat_crt
{%- endif %} {%- endif %}
- timeout: 30 - timeout: 30
- retry: - retry:
@@ -501,7 +501,7 @@ conf_filebeat_key:
interval: 30 interval: 30
# Request a cert and drop it where it needs to go to be distributed # Request a cert and drop it where it needs to go to be distributed
filebeat_crt: conf_filebeat_crt:
x509.certificate_managed: x509.certificate_managed:
- name: /opt/so/conf/filebeat/etc/pki/filebeat.crt - name: /opt/so/conf/filebeat/etc/pki/filebeat.crt
- ca_server: {{ ca_server }} - ca_server: {{ ca_server }}