Skip to content

Commit

Permalink
Merge pull request #304 from wazuh/feature-release-4.0.2
Browse files Browse the repository at this point in the history
wazuh-puppet: bump versions to 4.0.2
  • Loading branch information
Zenidd authored Nov 26, 2020
2 parents 5a7de5b + 635f309 commit 1108e40
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 17 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# Change Log
All notable changes to this project will be documented in this file.

## Wazuh Puppet v4.0.2

### Added

- Update to Wazuh version 4.0.2

### Fixed

- Syscheck 'report_changes' option ([@oletos7j](https://github.com/oletos7j)) [PR#306](https://github.com/wazuh/wazuh-puppet/pull/306)


## Wazuh Puppet v4.0.1

### Added
Expand Down
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
WAZUH-PUPPET_VERSION="v4.0.1"
REVISION="40001"
WAZUH-PUPPET_VERSION="v4.0.2"
REVISION="40002"
2 changes: 1 addition & 1 deletion kitchen/test/integration/agent/agent_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe package('wazuh-agent') do
it { is_expected.to be_installed }
its('version') { is_expected.to eq '4.0.1-1' }
its('version') { is_expected.to eq '4.0.2-1' }
end

describe service('wazuh-agent') do
Expand Down
2 changes: 1 addition & 1 deletion kitchen/test/integration/mngr/manager_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe package('wazuh-manager') do
it { is_expected.to be_installed }
its('version') { is_expected.to eq '4.0.1-1' }
its('version') { is_expected.to eq '4.0.2-1' }
end

describe service('wazuh-manager') do
Expand Down
4 changes: 2 additions & 2 deletions manifests/filebeat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
$filebeat_package = 'filebeat',
$filebeat_service = 'filebeat',
$filebeat_version = '7.9.3',
$wazuh_app_version = '4.0.1_7.9.3',
$wazuh_extensions_version = 'v4.0.1',
$wazuh_app_version = '4.0.2_7.9.3',
$wazuh_extensions_version = 'v4.0.2',
$wazuh_filebeat_module = 'wazuh-filebeat-0.1.tar.gz',
){

Expand Down
4 changes: 2 additions & 2 deletions manifests/filebeat_oss.pp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
$filebeat_oss_elastic_user = 'admin',
$filebeat_oss_elastic_password = 'admin',
$filebeat_oss_version = '7.9.1',
$wazuh_app_version = '4.0.1_7.9.1',
$wazuh_extensions_version = 'v4.0.1',
$wazuh_app_version = '4.0.2_7.9.1',
$wazuh_extensions_version = 'v4.0.2',
$wazuh_filebeat_module = 'wazuh-filebeat-0.1.tar.gz',
){

Expand Down
2 changes: 1 addition & 1 deletion manifests/kibana.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$kibana_package = 'kibana',
$kibana_service = 'kibana',
$kibana_version = '7.9.3',
$kibana_app_version = '4.0.1_7.9.3',
$kibana_app_version = '4.0.2_7.9.3',
$kibana_elasticsearch_ip = 'localhost',
$kibana_elasticsearch_port = '9200',

Expand Down
2 changes: 1 addition & 1 deletion manifests/kibana_od.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
$kibana_od_version = '1.11.0',
$kibana_od_elastic_user = 'admin',
$kibana_od_elastic_password = 'admin',
$kibana_od_app_version = '4.0.1_7.9.1',
$kibana_od_app_version = '4.0.2_7.9.1',
$kibana_od_elasticsearch_ip = 'localhost',
$kibana_od_elasticsearch_port = '9200',

Expand Down
2 changes: 1 addition & 1 deletion manifests/params_agent.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
# Wazuh-Agent configuration parameters
class wazuh::params_agent {
$agent_package_version = '4.0.1-1'
$agent_package_version = '4.0.2-1'
$agent_service_ensure = 'running'
$agent_msi_download_location = 'http://packages.wazuh.com/4.x/windows'

Expand Down
4 changes: 2 additions & 2 deletions manifests/params_manager.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'Linux': {

# Installation
$server_package_version = '4.0.1-1'
$server_package_version = '4.0.2-1'

$manage_repos = true
$manage_firewall = false
Expand Down Expand Up @@ -534,7 +534,7 @@
$keys_group = 'Administrators'

$agent_service = 'OssecSvc'
$agent_package = 'Wazuh Agent 4.0.1'
$agent_package = 'Wazuh Agent 4.0.2'
$server_service = ''
$server_package = ''
$api_service = ''
Expand Down
2 changes: 1 addition & 1 deletion manifests/repo_elasticsearch-oss.pp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
# Installation of Elastic repository
class wazuh::repo_elastic (

Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wazuh-wazuh",
"version": "4.0.1",
"version": "4.0.2",
"author": "WAZUH",
"summary": "Install and configure Wazuh-HIDS client and server",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions templates/fragments/_syscheck.erb
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@

<%- else -%>
<%- if @ossec_syscheck_directories_1 -%>
<directories check_all="yes" <%- if @ossec_syscheck_whodata_directories_1 == 'yes' -%>whodata="<%=@ossec_syscheck_whodata_directories_1%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_1 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_1%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_1 == 'yes' -%>report_changes="<%=@ossec_syscheck_report_changes_directories_1%>"<%- end -%>><%=@ossec_syscheck_directories_1%></directories>
<directories check_all="yes" <%- if @ossec_syscheck_whodata_directories_1 == 'yes' -%>whodata="<%=@ossec_syscheck_whodata_directories_1%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_1 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_1%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_1 == 'yes' -%> report_changes="<%=@ossec_syscheck_report_changes_directories_1%>"<%- end -%>><%=@ossec_syscheck_directories_1%></directories>
<%- end -%>
<%- if @ossec_syscheck_directories_2 -%>
<directories check_all="yes" <%- if @ossec_syscheck_whodata_directories_2 == 'yes' -%>whodata="<%=@ossec_syscheck_whodata_directories_2%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_2 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_2%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_2 == 'yes' -%>report_changes="<%=@ossec_syscheck_report_changes_directories_2%>"<%- end -%>><%=@ossec_syscheck_directories_2%></directories>
<directories check_all="yes" <%- if @ossec_syscheck_whodata_directories_2 == 'yes' -%>whodata="<%=@ossec_syscheck_whodata_directories_2%>"<%- end -%> <%- if @ossec_syscheck_realtime_directories_2 == 'yes' -%> realtime="<%=@ossec_syscheck_realtime_directories_2%>"<%- end -%> <%- if @ossec_syscheck_report_changes_directories_2 == 'yes' -%> report_changes="<%=@ossec_syscheck_report_changes_directories_2%>"<%- end -%>><%=@ossec_syscheck_directories_2%></directories>
<%- end -%>
<%- if @ossec_syscheck_ignore_list -%>
<%- @ossec_syscheck_ignore_list.each do |ignore_element| -%>
Expand Down

0 comments on commit 1108e40

Please sign in to comment.