From cb9911f85eaa4d00bcf6c057f85ced5433178991 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 15 Sep 2025 12:56:17 -0300 Subject: [PATCH 1/3] Add Rocky Linux support --- manifests/agent.pp | 11 +++++++++++ manifests/filebeat_oss.pp | 9 +++++---- manifests/indexer.pp | 9 +++++---- manifests/manager.pp | 16 ++++++++++++++-- manifests/params_agent.pp | 6 ++++++ manifests/params_manager.pp | 18 ++++++++++++++++-- manifests/repo.pp | 2 +- metadata.json | 11 ++++++++++- 8 files changed, 68 insertions(+), 14 deletions(-) diff --git a/manifests/agent.pp b/manifests/agent.pp index c06d1052..490afd84 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -321,6 +321,17 @@ $apply_template_os = 'centos' } 'SLES':{ $apply_template_os = 'suse' + } 'Rocky':{ + $apply_template_os = 'rhel' + if ( $facts['os']['release']['full'] =~ /^10.*/ ) { + $rhel_version = '10' + } + elsif ( $facts['os']['release']['full'] =~ /^9.*/ ) { + $rhel_version = '9' + } + elsif ( $facts['os']['release']['full'] =~ /^8.*/ ) { + $rhel_version = '8' + } } default: { fail('OS not supported') } } diff --git a/manifests/filebeat_oss.pp b/manifests/filebeat_oss.pp index c4ec1758..47c5d779 100644 --- a/manifests/filebeat_oss.pp +++ b/manifests/filebeat_oss.pp @@ -113,9 +113,10 @@ } service { 'filebeat': - ensure => running, - enable => true, - name => $filebeat_oss_service, - require => Package['filebeat'], + ensure => running, + enable => true, + name => $filebeat_oss_service, + require => Package['filebeat'], + provider => 'systemd', } } diff --git a/manifests/indexer.pp b/manifests/indexer.pp index 2a8cffea..6184c8ee 100644 --- a/manifests/indexer.pp +++ b/manifests/indexer.pp @@ -139,10 +139,11 @@ } service { 'wazuh-indexer': - ensure => running, - enable => true, - name => $indexer_service, - require => Package['wazuh-indexer'], + ensure => running, + enable => true, + name => $indexer_service, + require => Package['wazuh-indexer'], + provider => 'systemd', } file_line { "Insert line limits nofile for ${indexer_fileuser}": diff --git a/manifests/manager.pp b/manifests/manager.pp index 99262e0a..b6569f18 100644 --- a/manifests/manager.pp +++ b/manifests/manager.pp @@ -308,8 +308,9 @@ } } service { 'auditd': - ensure => running, - enable => true, + ensure => running, + enable => true, + provider => 'systemd', } } @@ -400,6 +401,17 @@ $apply_template_os = 'amazon' } 'CentOS','Centos','centos':{ $apply_template_os = 'centos' + } 'Rocky':{ + $apply_template_os = 'rhel' + if ( $facts['os']['release']['full'] =~ /^10.*/ ) { + $rhel_version = '10' + } + elsif ( $facts['os']['release']['full'] =~ /^9.*/ ) { + $rhel_version = '9' + } + elsif ( $facts['os']['release']['full'] =~ /^8.*/ ) { + $rhel_version = '8' + } } default: { fail('This ossec module has not been tested on your distribution') } } diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp index ff3b0b3b..80f06d59 100644 --- a/manifests/params_agent.pp +++ b/manifests/params_agent.pp @@ -457,6 +457,12 @@ if ( $facts['os']['release']['full'] =~ /^8.*/ ) { $ossec_service_provider = 'redhat' } + if ( $facts['os']['release']['full'] =~ /^9.*/ ) { + $ossec_service_provider = 'systemd' + } + if ( $facts['os']['release']['full'] =~ /^10.*/ ) { + $ossec_service_provider = 'systemd' + } } default: { fail('This ossec module has not been tested on your distribution') } } diff --git a/manifests/params_manager.pp b/manifests/params_manager.pp index 286f9a68..ca7c1e94 100644 --- a/manifests/params_manager.pp +++ b/manifests/params_manager.pp @@ -518,8 +518,22 @@ } 'AlmaLinux': { if ( $facts['os']['release']['full'] =~ /^8.*/ ) { - $ossec_service_provider = 'redhat' - $api_service_provider = 'redhat' + $ossec_service_provider = 'systemd' + $api_service_provider = 'systemd' + } + } + 'Rocky': { + if ( $facts['os']['release']['full'] =~ /^8.*/ ) { + $ossec_service_provider = 'systemd' + $api_service_provider = 'systemd' + } + if ( $facts['os']['release']['full'] =~ /^9.*/ ) { + $ossec_service_provider = 'systemd' + $api_service_provider = 'systemd' + } + if ( $facts['os']['release']['full'] =~ /^10.*/ ) { + $ossec_service_provider = 'systemd' + $api_service_provider = 'systemd' } } default: { fail('This ossec module has not been tested on your distribution') } diff --git a/manifests/repo.pp b/manifests/repo.pp index e6b4a940..151539c8 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -81,7 +81,7 @@ } # Set up OSSEC repo case $facts['os'][name] { - /^(CentOS|RedHat|OracleLinux|Fedora|Amazon|AlmaLinux)$/: { + /^(CentOS|RedHat|OracleLinux|Fedora|Amazon|AlmaLinux|Rocky)$/: { yumrepo { 'wazuh': descr => 'WAZUH OSSEC Repository - www.wazuh.com', enabled => true, diff --git a/metadata.json b/metadata.json index 88f6004d..0cc1c60c 100755 --- a/metadata.json +++ b/metadata.json @@ -63,7 +63,16 @@ "5", "6", "7", - "8" + "8", + "9" + ] + }, + { + "operatingsystem": "Rocky", + "operatingsystemrelease": [ + "8", + "9", + "10" ] }, { From 96c94aaa08231aa1e6e147612d9aefa0f3429bc2 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 15 Sep 2025 12:57:55 -0300 Subject: [PATCH 2/3] Add Rocky Linux support --- manifests/params_agent.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/params_agent.pp b/manifests/params_agent.pp index 80f06d59..96c46da5 100644 --- a/manifests/params_agent.pp +++ b/manifests/params_agent.pp @@ -450,12 +450,12 @@ } 'AlmaLinux': { if ( $facts['os']['release']['full'] =~ /^8.*/ ) { - $ossec_service_provider = 'redhat' + $ossec_service_provider = 'systemd' } } 'Rocky': { if ( $facts['os']['release']['full'] =~ /^8.*/ ) { - $ossec_service_provider = 'redhat' + $ossec_service_provider = 'systemd' } if ( $facts['os']['release']['full'] =~ /^9.*/ ) { $ossec_service_provider = 'systemd' From d44442c83fd2098cfe7c157e0ff8aff564851a8c Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 15 Sep 2025 13:00:34 -0300 Subject: [PATCH 3/3] Add changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4c2386f..264fd5b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. ### Added -- None +- Add Rocky Linux support. ([#1438](https://github.com/wazuh/wazuh-puppet/pull/1438)) ### Changed