yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Merge pull request #534 from wazuh/503-merge-master

Browse Source 
Merge 4.2 in master
This commit is contained in:
José Fernández Aguilera
2021-10-13 09:34:24 +02:00
committed by GitHub
parent 2a297bab38 515f0daff4
commit f17afc438e
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+5
View File
@@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file.
- Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430) - Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
## Wazuh Docker v4.2.3
### Added
- Update Wazuh to version [4.2.3](https://github.com/wazuh/wazuh/blob/v4.2.3/CHANGELOG.md#v423)
## Wazuh Docker v4.2.2 ## Wazuh Docker v4.2.2
### Added ### Added
README.md
+1
View File
@@ -154,6 +154,7 @@ ADMIN_PRIVILEGES=true # App privileges
| Wazuh version | ODFE | XPACK | | Wazuh version | ODFE | XPACK |
|---------------|---------|--------| |---------------|---------|--------|
| v4.3.0 | 1.13.2 | 7.11.2 | | v4.3.0 | 1.13.2 | 7.11.2 |
| v4.2.3 | 1.13.2 | 7.11.2 |
| v4.2.2 | 1.13.2 | 7.11.2 | | v4.2.2 | 1.13.2 | 7.11.2 |
| v4.2.1 | 1.13.2 | 7.11.2 | | v4.2.1 | 1.13.2 | 7.11.2 |
| v4.2.0 | 1.13.2 | 7.10.2 | | v4.2.0 | 1.13.2 | 7.10.2 |
production_cluster/wazuh_cluster/wazuh_manager.conf
+2 -2
View File
@@ -200,8 +200,8 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>4.2.2.1</white_list> <white_list>4.3.0.1</white_list>
<white_list>4.2.2.2</white_list> <white_list>4.3.0.2</white_list>
<white_list>208.67.220.220</white_list> <white_list>208.67.220.220</white_list>
</global> </global>
production_cluster/wazuh_cluster/wazuh_worker.conf
+2 -2
View File
@@ -200,8 +200,8 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>4.2.2.1</white_list> <white_list>4.3.0.1</white_list>
<white_list>4.2.2.2</white_list> <white_list>4.3.0.2</white_list>
<white_list>208.67.220.220</white_list> <white_list>208.67.220.220</white_list>
</global> </global>