diff --git a/CHANGELOG.md b/CHANGELOG.md index 7eb97385..ef708fd2 100644 --- 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.4.0 Wazuh release. +## Wazuh Puppet v4.3.11 + +### Added + +- Support to 4.3.11 Wazuh release. + ## Wazuh Puppet v4.3.10 ### Added diff --git a/VERSION b/VERSION index 2848f4d1..3a53ea1d 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ WAZUH-PUPPET_VERSION="v4.4.1" REVISION="40406" -VERSION=4.4.1 \ No newline at end of file +VERSION=4.4.1 diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 888a1f84..df857b14 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -32,7 +32,6 @@ $manage_repos = false, # Change to true when manager is not present. ) { - if $manage_repos { include wazuh::repo @@ -127,5 +126,4 @@ hasrestart => true, name => $dashboard_service, } - } diff --git a/manifests/filebeat_oss.pp b/manifests/filebeat_oss.pp index 05008490..afe0c0f6 100644 --- a/manifests/filebeat_oss.pp +++ b/manifests/filebeat_oss.pp @@ -46,7 +46,7 @@ # Needed since GitHub can only ETAG and result in changes of the mtime everytime. # TODO: Include file into the wazuh/wazuh-puppet project or use file { checksum => '..' } for this instead of the exec construct. exec { 'cleanup /etc/filebeat/wazuh-template.json': - command => '/bin/rm /etc/filebeat/wazuh-template.json', + command => '/bin/rm -f /etc/filebeat/wazuh-template.json', onlyif => '/bin/test -f /etc/filebeat/wazuh-template.json', unless => "/bin/curl -s 'https://raw.githubusercontent.com/wazuh/wazuh/${wazuh_extensions_version}/extensions/elasticsearch/7.x/wazuh-template.json' | /bin/cmp -s '/etc/filebeat/wazuh-template.json'", } @@ -114,4 +114,4 @@ name => $filebeat_oss_service, require => Package['filebeat'], } -} \ No newline at end of file +} diff --git a/templates/opensearch_dashboards_yml.erb b/templates/opensearch_dashboards_yml.erb index e07cce83..d9af799f 100644 --- a/templates/opensearch_dashboards_yml.erb +++ b/templates/opensearch_dashboards_yml.erb @@ -11,4 +11,4 @@ server.ssl.enabled: true server.ssl.key: "/etc/wazuh-dashboard/certs/dashboard-key.pem" server.ssl.certificate: "/etc/wazuh-dashboard/certs/dashboard.pem" opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"] -uiSettings.overrides.defaultRoute: /app/wazuh \ No newline at end of file +uiSettings.overrides.defaultRoute: /app/wazuh diff --git a/templates/wazuh_api_yml.erb b/templates/wazuh_api_yml.erb index 7bea295a..6b2e67b0 100644 --- a/templates/wazuh_api_yml.erb +++ b/templates/wazuh_api_yml.erb @@ -48,4 +48,4 @@ upload_configuration: exceptions: [] limits: eps: - allow: <%= @limits_eps %> \ No newline at end of file + allow: <%= @limits_eps %> diff --git a/templates/wazuh_dashboard_yml.erb b/templates/wazuh_dashboard_yml.erb index 387b2836..6f154c03 100644 --- a/templates/wazuh_dashboard_yml.erb +++ b/templates/wazuh_dashboard_yml.erb @@ -14,4 +14,3 @@ server.ssl.key: "<%= @dashboard_path_certs %>/dashboard-key.pem" server.ssl.certificate: "<%= @dashboard_path_certs %>/dashboard.pem" opensearch.ssl.certificateAuthorities: ["<%= @dashboard_path_certs %>/root-ca.pem"] uiSettings.overrides.defaultRoute: /app/wazuh -