Merge pull request #935 from wazuh/merge-4.5.1-into-4.5.2

Merge `4.5.1` into `4.5.2`
This commit is contained in:
David Correa Rodríguez
2023-08-11 12:25:04 +02:00
committed by GitHub
6 changed files with 28 additions and 10 deletions
@@ -153,7 +153,6 @@
<!-- Aggregate vulnerabilities -->
<provider name="nvd">
<enabled>yes</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>
@@ -153,7 +153,6 @@
<!-- Aggregate vulnerabilities -->
<provider name="nvd">
<enabled>yes</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>
+14
View File
@@ -6,6 +6,13 @@ services:
image: wazuh/wazuh-manager:4.5.2
hostname: wazuh.master
restart: always
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 655360
hard: 655360
ports:
- "1515:1515"
- "514:514/udp"
@@ -41,6 +48,13 @@ services:
image: wazuh/wazuh-manager:4.5.2
hostname: wazuh.worker
restart: always
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 655360
hard: 655360
environment:
- INDEXER_URL=https://wazuh1.indexer:9200
- INDEXER_USERNAME=admin