Merge 4.2.3 into master

This commit is contained in:
vcerenu
2021-10-12 12:34:39 -03:00
16 changed files with 51 additions and 44 deletions
@@ -6,7 +6,7 @@
<logall_json>no</logall_json>
<email_notification>no</email_notification>
<smtp_server>smtp.example.wazuh.com</smtp_server>
<email_from>ossecm@example.wazuh.com</email_from>
<email_from>wazuh@example.wazuh.com</email_from>
<email_to>recipient@example.wazuh.com</email_to>
<email_maxperhour>12</email_maxperhour>
<email_log_source>alerts.log</email_log_source>
@@ -200,8 +200,8 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>4.2.3.1</white_list>
<white_list>4.2.3.2</white_list>
<white_list>4.3.0.1</white_list>
<white_list>4.3.0.2</white_list>
<white_list>208.67.220.220</white_list>
</global>
@@ -6,7 +6,7 @@
<logall_json>no</logall_json>
<email_notification>no</email_notification>
<smtp_server>smtp.example.wazuh.com</smtp_server>
<email_from>ossecm@example.wazuh.com</email_from>
<email_from>wazuh@example.wazuh.com</email_from>
<email_to>recipient@example.wazuh.com</email_to>
<email_maxperhour>12</email_maxperhour>
<email_log_source>alerts.log</email_log_source>
@@ -200,8 +200,8 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>4.2.3.1</white_list>
<white_list>4.2.3.2</white_list>
<white_list>4.3.0.1</white_list>
<white_list>4.3.0.2</white_list>
<white_list>208.67.220.220</white_list>
</global>