Merge pull request #1167 from wazuh/merge-4.10.2-into-master

Merge 4.10.2 into master
wazuh · Nov 4, 2024 · e672982 · e672982
2 parents a583f3c + 2e5ac19
commit e672982
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Delete API parameters from wazuh.yml template ([#1155](https://github.com/wazuh/wazuh-puppet/pull/1155)) \- (Puppet Module)
 - Add URI file after upload ([#1143](https://github.com/wazuh/wazuh-puppet/pull/1143)) \- (Puppet Module Builder)
 - Modfy Puppet module builder ([#1113](https://github.com/wazuh/wazuh-puppet/pull/1113)) \- (Puppet Module Builder)
 
@@ -75,6 +76,12 @@ All notable changes to this project will be documented in this file.
 
 - None
 
+## Wazuh Puppet v4.9.2
+
+### Added
+
+- Support to 4.9.2 Wazuh release.
+
 ## Wazuh Puppet v4.9.1
 
 ### Added

diff --git a/manifests/manager.pp b/manifests/manager.pp
@@ -283,9 +283,6 @@
 
 
       $wazuh_api_cors_allow_credentials         = $::wazuh::params_manager::wazuh_api_cors_allow_credentials,
-      $wazuh_api_cache_enabled                  = $::wazuh::params_manager::wazuh_api_cache_enabled,
-
-      $wazuh_api_cache_time                     = $::wazuh::params_manager::wazuh_api_cache_time,
 
       $wazuh_api_access_max_login_attempts      = $::wazuh::params_manager::wazuh_api_access_max_login_attempts,
       $wazuh_api_access_block_time              = $::wazuh::params_manager::wazuh_api_access_block_time,

diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp
@@ -314,7 +314,7 @@
 
       #API
 
-      $wazuh_api_host = '0.0.0.0'
+      $wazuh_api_host = ['0.0.0.0']
       $wazuh_api_port = '55000'
 
       $wazuh_api_file =  undef
@@ -341,10 +341,6 @@
       $wazuh_api_cors_allow_headers = '"*"'
       $wazuh_api_cors_allow_credentials = 'no'
 
-      # Cache (time in seconds)
-      $wazuh_api_cache_enabled = 'yes'
-      $wazuh_api_cache_time = '0.750'
-
       # Access parameters
       $wazuh_api_access_max_login_attempts = 5
       $wazuh_api_access_block_time = 300

diff --git a/templates/wazuh_api_yml.erb b/templates/wazuh_api_yml.erb
@@ -24,10 +24,6 @@ cors:
   expose_headers: <%= @wazuh_api_cors_expose_headers %>
   allow_headers: <%= @wazuh_api_cors_allow_headers %>
   allow_credentials: <%= @wazuh_api_cors_allow_credentials %>
-# Cache (time in seconds)
-cache:
-  enabled: <%= @wazuh_api_cache_enabled %>
-  time: <%= @wazuh_api_cache_time %>
 # Access parameters
 access:
   max_login_attempts: <%= @wazuh_api_access_max_login_attempts %>