forked from wazuh/wazuh-docker
Merge conflicts with master branch
This commit is contained in:
@@ -10,6 +10,10 @@ All notable changes to this project will be documented in this file.
|
|||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Update Wazuh to version [4.2.0](https://github.com/wazuh/wazuh/blob/v4.2.0/CHANGELOG.md#v420)
|
- Update Wazuh to version [4.2.0](https://github.com/wazuh/wazuh/blob/v4.2.0/CHANGELOG.md#v420)
|
||||||
|
## Wazuh Docker v4.1.5
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Update Wazuh to version [4.1.5](https://github.com/wazuh/wazuh/blob/v4.1.5/CHANGELOG.md#v415)
|
||||||
|
|
||||||
## Wazuh Docker v4.1.4
|
## Wazuh Docker v4.1.4
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
WAZUH-DOCKER_VERSION="4.3.0"
|
WAZUH-DOCKER_VERSION="4.3.0"
|
||||||
REVISION="41100"
|
REVISION="43100"
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ PERMANENT_DATA[((i++))]="/var/ossec/api/configuration"
|
|||||||
PERMANENT_DATA[((i++))]="/var/ossec/etc"
|
PERMANENT_DATA[((i++))]="/var/ossec/etc"
|
||||||
PERMANENT_DATA[((i++))]="/var/ossec/logs"
|
PERMANENT_DATA[((i++))]="/var/ossec/logs"
|
||||||
PERMANENT_DATA[((i++))]="/var/ossec/queue"
|
PERMANENT_DATA[((i++))]="/var/ossec/queue"
|
||||||
|
PERMANENT_DATA[((i++))]="/var/ossec/queue/tasks"
|
||||||
PERMANENT_DATA[((i++))]="/var/ossec/agentless"
|
PERMANENT_DATA[((i++))]="/var/ossec/agentless"
|
||||||
PERMANENT_DATA[((i++))]="/var/ossec/var/multigroups"
|
PERMANENT_DATA[((i++))]="/var/ossec/var/multigroups"
|
||||||
PERMANENT_DATA[((i++))]="/var/ossec/integrations"
|
PERMANENT_DATA[((i++))]="/var/ossec/integrations"
|
||||||
|
|||||||
Reference in New Issue
Block a user