Skip to content

Commit 5c67760

Browse files
authored
Merge pull request #1438 from wazuh/enhancement-/1433-rocky-linux-support
Add Rocky Linux support
2 parents 3bd6ccb + d44442c commit 5c67760

File tree

9 files changed

+71
-17
lines changed

9 files changed

+71
-17
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55

66
### Added
77

8-
- None
8+
- Add Rocky Linux support. ([#1438](https://github.com/wazuh/wazuh-puppet/pull/1438))
99

1010
### Changed
1111

manifests/agent.pp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,17 @@
321321
$apply_template_os = 'centos'
322322
} 'SLES':{
323323
$apply_template_os = 'suse'
324+
} 'Rocky':{
325+
$apply_template_os = 'rhel'
326+
if ( $facts['os']['release']['full'] =~ /^10.*/ ) {
327+
$rhel_version = '10'
328+
}
329+
elsif ( $facts['os']['release']['full'] =~ /^9.*/ ) {
330+
$rhel_version = '9'
331+
}
332+
elsif ( $facts['os']['release']['full'] =~ /^8.*/ ) {
333+
$rhel_version = '8'
334+
}
324335
}
325336
default: { fail('OS not supported') }
326337
}

manifests/filebeat_oss.pp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,10 @@
113113
}
114114

115115
service { 'filebeat':
116-
ensure => running,
117-
enable => true,
118-
name => $filebeat_oss_service,
119-
require => Package['filebeat'],
116+
ensure => running,
117+
enable => true,
118+
name => $filebeat_oss_service,
119+
require => Package['filebeat'],
120+
provider => 'systemd',
120121
}
121122
}

manifests/indexer.pp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,11 @@
139139
}
140140

141141
service { 'wazuh-indexer':
142-
ensure => running,
143-
enable => true,
144-
name => $indexer_service,
145-
require => Package['wazuh-indexer'],
142+
ensure => running,
143+
enable => true,
144+
name => $indexer_service,
145+
require => Package['wazuh-indexer'],
146+
provider => 'systemd',
146147
}
147148

148149
file_line { "Insert line limits nofile for ${indexer_fileuser}":

manifests/manager.pp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,9 @@
308308
}
309309
}
310310
service { 'auditd':
311-
ensure => running,
312-
enable => true,
311+
ensure => running,
312+
enable => true,
313+
provider => 'systemd',
313314
}
314315
}
315316

@@ -400,6 +401,17 @@
400401
$apply_template_os = 'amazon'
401402
} 'CentOS','Centos','centos':{
402403
$apply_template_os = 'centos'
404+
} 'Rocky':{
405+
$apply_template_os = 'rhel'
406+
if ( $facts['os']['release']['full'] =~ /^10.*/ ) {
407+
$rhel_version = '10'
408+
}
409+
elsif ( $facts['os']['release']['full'] =~ /^9.*/ ) {
410+
$rhel_version = '9'
411+
}
412+
elsif ( $facts['os']['release']['full'] =~ /^8.*/ ) {
413+
$rhel_version = '8'
414+
}
403415
}
404416
default: { fail('This ossec module has not been tested on your distribution') }
405417
}

manifests/params_agent.pp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,12 +450,18 @@
450450
}
451451
'AlmaLinux': {
452452
if ( $facts['os']['release']['full'] =~ /^8.*/ ) {
453-
$ossec_service_provider = 'redhat'
453+
$ossec_service_provider = 'systemd'
454454
}
455455
}
456456
'Rocky': {
457457
if ( $facts['os']['release']['full'] =~ /^8.*/ ) {
458-
$ossec_service_provider = 'redhat'
458+
$ossec_service_provider = 'systemd'
459+
}
460+
if ( $facts['os']['release']['full'] =~ /^9.*/ ) {
461+
$ossec_service_provider = 'systemd'
462+
}
463+
if ( $facts['os']['release']['full'] =~ /^10.*/ ) {
464+
$ossec_service_provider = 'systemd'
459465
}
460466
}
461467
default: { fail('This ossec module has not been tested on your distribution') }

manifests/params_manager.pp

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,22 @@
518518
}
519519
'AlmaLinux': {
520520
if ( $facts['os']['release']['full'] =~ /^8.*/ ) {
521-
$ossec_service_provider = 'redhat'
522-
$api_service_provider = 'redhat'
521+
$ossec_service_provider = 'systemd'
522+
$api_service_provider = 'systemd'
523+
}
524+
}
525+
'Rocky': {
526+
if ( $facts['os']['release']['full'] =~ /^8.*/ ) {
527+
$ossec_service_provider = 'systemd'
528+
$api_service_provider = 'systemd'
529+
}
530+
if ( $facts['os']['release']['full'] =~ /^9.*/ ) {
531+
$ossec_service_provider = 'systemd'
532+
$api_service_provider = 'systemd'
533+
}
534+
if ( $facts['os']['release']['full'] =~ /^10.*/ ) {
535+
$ossec_service_provider = 'systemd'
536+
$api_service_provider = 'systemd'
523537
}
524538
}
525539
default: { fail('This ossec module has not been tested on your distribution') }

manifests/repo.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
}
8282
# Set up OSSEC repo
8383
case $facts['os'][name] {
84-
/^(CentOS|RedHat|OracleLinux|Fedora|Amazon|AlmaLinux)$/: {
84+
/^(CentOS|RedHat|OracleLinux|Fedora|Amazon|AlmaLinux|Rocky)$/: {
8585
yumrepo { 'wazuh':
8686
descr => 'WAZUH OSSEC Repository - www.wazuh.com',
8787
enabled => true,

metadata.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,16 @@
6363
"5",
6464
"6",
6565
"7",
66-
"8"
66+
"8",
67+
"9"
68+
]
69+
},
70+
{
71+
"operatingsystem": "Rocky",
72+
"operatingsystemrelease": [
73+
"8",
74+
"9",
75+
"10"
6776
]
6877
},
6978
{

0 commit comments

Comments
 (0)