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:22:15 -04:00
parent fed8bfac67
commit f61400680d
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/filebeat/init.sls
View File

@@ -142,7 +142,7 @@ so-filebeat:
- file: filebeatmoduleconf - file: filebeatmoduleconf
- file: filebeatmoduledir - file: filebeatmoduledir
- x509: filebeat_crt - x509: filebeat_crt
- x509: filebeat_key - x509: conf_filebeat_key
- x509: trusttheca - x509: trusttheca
{% if grains.role in ES_INCLUDED_NODES %} {% if grains.role in ES_INCLUDED_NODES %}

1
salt/logstash/init.sls
View File

@@ -201,7 +201,6 @@ so-logstash:
{% endfor %} {% endfor %}
- require: - require:
- x509: filebeat_crt - x509: filebeat_crt
- x509: filebeat_key
{% if grains['role'] == 'so-heavynode' %} {% if grains['role'] == 'so-heavynode' %}
- x509: trusttheca - x509: trusttheca
{% else %} {% else %}

8
salt/ssl/init.sls
View File

@@ -163,7 +163,7 @@ rediskeyperms:
{% endif %} {% endif %}
{% if grains['role'] in ['so-manager', 'so-eval', 'so-helix', 'so-managersearch', 'so-standalone', 'so-import', 'so-heavynode'] %} {% if grains['role'] in ['so-manager', 'so-eval', 'so-helix', 'so-managersearch', 'so-standalone', 'so-import', 'so-heavynode'] %}
filebeat_key: etc_filebeat_key:
x509.private_key_managed: x509.private_key_managed:
- name: /etc/pki/filebeat.key - name: /etc/pki/filebeat.key
- CN: {{ COMMONNAME }} - CN: {{ COMMONNAME }}
@@ -205,7 +205,7 @@ filebeat_crt:
cmd.run: cmd.run:
- name: "/usr/bin/openssl pkcs8 -in /etc/pki/filebeat.key -topk8 -out /etc/pki/filebeat.p8 -nocrypt" - name: "/usr/bin/openssl pkcs8 -in /etc/pki/filebeat.key -topk8 -out /etc/pki/filebeat.p8 -nocrypt"
- onchanges: - onchanges:
- x509: filebeat_key - x509: etc_filebeat_key
fbperms: fbperms:
@@ -482,7 +482,7 @@ fbcertdir:
- name: /opt/so/conf/filebeat/etc/pki - name: /opt/so/conf/filebeat/etc/pki
- makedirs: True - makedirs: True
filebeat_key: conf_filebeat_key:
x509.private_key_managed: x509.private_key_managed:
- name: /opt/so/conf/filebeat/etc/pki/filebeat.key - name: /opt/so/conf/filebeat/etc/pki/filebeat.key
- CN: {{ COMMONNAME }} - CN: {{ COMMONNAME }}
@@ -527,7 +527,7 @@ filebeatpkcs:
cmd.run: cmd.run:
- name: "/usr/bin/openssl pkcs8 -in /opt/so/conf/filebeat/etc/pki/filebeat.key -topk8 -out /opt/so/conf/filebeat/etc/pki/filebeat.p8 -passout pass:" - name: "/usr/bin/openssl pkcs8 -in /opt/so/conf/filebeat/etc/pki/filebeat.key -topk8 -out /opt/so/conf/filebeat/etc/pki/filebeat.p8 -passout pass:"
- onchanges: - onchanges:
- x509: filebeat_key - x509: conf_filebeat_key
filebeatkeyperms: filebeatkeyperms:
file.managed: file.managed: