forked from wazuh/wazuh-docker
Merge 4.2 into master
This commit is contained in:
@@ -27,13 +27,8 @@ nodes:
|
|||||||
- name: filebeat
|
- name: filebeat
|
||||||
dn: CN=filebeat,OU=Ops,O=Example\, Inc.,DC=example,DC=com
|
dn: CN=filebeat,OU=Ops,O=Example\, Inc.,DC=example,DC=com
|
||||||
dns:
|
dns:
|
||||||
<<<<<<< HEAD
|
|
||||||
- wazuh
|
- wazuh
|
||||||
|
|
||||||
=======
|
|
||||||
- wazuh
|
|
||||||
|
|
||||||
>>>>>>> f34b7d0465dbc8bf717d81e2bc4f13f44a03a55d
|
|
||||||
clients:
|
clients:
|
||||||
- name: admin
|
- name: admin
|
||||||
dn: CN=admin,OU=Ops,O=Example\, Inc.,DC=example,DC=com
|
dn: CN=admin,OU=Ops,O=Example\, Inc.,DC=example,DC=com
|
||||||
|
|||||||
Reference in New Issue
Block a user