Merge branch '4.6.0' into merge-4.6.0-into-4.7.0

wazuh · Sep 7, 2023 · fd153d0 · fd153d0
2 parents 882e9f4 + 6e5490a
commit fd153d0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,12 @@ All notable changes to this project will be documented in this file.
 
 - Support to 4.6.0 Wazuh release.
 
+## Wazuh Puppet v4.5.3
+
+### Added
+
+- Support to 4.5.3 Wazuh release.
+
 ## Wazuh Puppet v4.5.2
 
 ### Added

diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
@@ -113,7 +113,7 @@
   }
 
   unless $use_keystore {
-    file { '/usr/share/wazuh-dashboard/config/opensearch_dashboards.keystore':
+    file { '/etc/wazuh-dashboard/opensearch_dashboards.keystore':
       ensure  => absent,
       require => Package['wazuh-dashboard'],
       before  => Service['wazuh-dashboard'],

diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp
@@ -335,7 +335,7 @@
                 }
               }
             }
-            /^(wheezy|stretch|buster|bullseye|sid|precise|trusty|vivid|wily|xenial|bionic|focal|groovy|jammy)$/: {
+            /^(wheezy|stretch|buster|bullseye|bookworm|sid|precise|trusty|vivid|wily|xenial|bionic|focal|groovy|jammy)$/: {
               $server_service = 'wazuh-manager'
               $server_package = 'wazuh-manager'
               $wodle_openscap_content = undef

diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp
@@ -212,7 +212,7 @@
         '12-server',
         '12-desktop',
         '15-server',
-        '15-desktop
+        '15-desktop'
       ]
       $vulnerability_detector_provider_suse_update_interval   = '1h'
 
@@ -460,7 +460,7 @@
                 }
               }
             }
-            /^(wheezy|stretch|buster|bullseye|sid|precise|trusty|vivid|wily|xenial|bionic|focal|groovy|jammy)$/: {
+            /^(wheezy|stretch|buster|bullseye|bookworm|sid|precise|trusty|vivid|wily|xenial|bionic|focal|groovy|jammy)$/: {
               $server_service = 'wazuh-manager'
               $server_package = 'wazuh-manager'
               $wodle_openscap_content = undef

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -16,7 +16,7 @@
         server => 'pgp.mit.edu'
       }
       case $::lsbdistcodename {
-        /(jessie|wheezy|stretch|buster|bullseye|sid|precise|trusty|vivid|wily|xenial|yakketi|bionic|focal|groovy|jammy)/: {
+        /(jessie|wheezy|stretch|buster|bullseye|bookworm|sid|precise|trusty|vivid|wily|xenial|yakketi|bionic|focal|groovy|jammy)/: {
 
           apt::source { 'wazuh':
             ensure   => present,