From e567738829f1871602fd8f59c59f2da00a49455c Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Thu, 1 Feb 2024 13:58:52 +0000 Subject: [PATCH 1/3] fix wazuh docs formatting --- doc/source/configuration/wazuh.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/source/configuration/wazuh.rst b/doc/source/configuration/wazuh.rst index db9f9a37c..683d066db 100644 --- a/doc/source/configuration/wazuh.rst +++ b/doc/source/configuration/wazuh.rst @@ -226,11 +226,12 @@ You may need to modify some of the variables, including: .. note:: - NOTE: If you are using multiple environments, and you need to customise Wazuh in each environment, create override files in an appropriate directory, - for example `etc/kayobe/environments/production/inventory/group_vars/` + for example ``etc/kayobe/environments/production/inventory/group_vars/``. + Files which values can be overridden (in the context of Wazuh): + - etc/kayobe/inventory/group_vars/wazuh/wazuh-manager/wazuh-manager - etc/kayobe/wazuh-manager.yml - etc/kayobe/inventory/group_vars/wazuh/wazuh-agent/wazuh-agent From 39248f81ce6d2b9522cedac3173cdeaf6653e38d Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Thu, 1 Feb 2024 13:59:45 +0000 Subject: [PATCH 2/3] add wazuh keypaths for multiple environments to docs --- doc/source/configuration/wazuh.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/source/configuration/wazuh.rst b/doc/source/configuration/wazuh.rst index 683d066db..d1391db63 100644 --- a/doc/source/configuration/wazuh.rst +++ b/doc/source/configuration/wazuh.rst @@ -231,7 +231,7 @@ You may need to modify some of the variables, including: for example ``etc/kayobe/environments/production/inventory/group_vars/``. Files which values can be overridden (in the context of Wazuh): - + - etc/kayobe/inventory/group_vars/wazuh/wazuh-manager/wazuh-manager - etc/kayobe/wazuh-manager.yml - etc/kayobe/inventory/group_vars/wazuh/wazuh-agent/wazuh-agent @@ -317,6 +317,9 @@ If you are using the wazuh generated certificates, this will result in the creation of some certificates and keys (in case of custom certs adjust path to it). Encrypt the keys (and remember to commit to git): +``ansible-vault encrypt --vault-password-file ~/vault.pass $KAYOBE_CONFIG_PATH/environments//wazuh/wazuh-certificates/*.key`` + +if using the kayobe environments feature, otherwise: ``ansible-vault encrypt --vault-password-file ~/vault.pass $KAYOBE_CONFIG_PATH/ansible/wazuh/certificates/certs/*.key`` From 8ed7c54fe60047517a8a548b438ceca63fbf466f Mon Sep 17 00:00:00 2001 From: Steve Brasier <33413598+sjpb@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:19:28 +0000 Subject: [PATCH 3/3] docs format nit Co-authored-by: Alex-Welsh <112560678+Alex-Welsh@users.noreply.github.com> --- doc/source/configuration/wazuh.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/configuration/wazuh.rst b/doc/source/configuration/wazuh.rst index d1391db63..deceff077 100644 --- a/doc/source/configuration/wazuh.rst +++ b/doc/source/configuration/wazuh.rst @@ -319,7 +319,7 @@ Encrypt the keys (and remember to commit to git): ``ansible-vault encrypt --vault-password-file ~/vault.pass $KAYOBE_CONFIG_PATH/environments//wazuh/wazuh-certificates/*.key`` -if using the kayobe environments feature, otherwise: +If using the kayobe environments feature, otherwise: ``ansible-vault encrypt --vault-password-file ~/vault.pass $KAYOBE_CONFIG_PATH/ansible/wazuh/certificates/certs/*.key``