-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix init.d file installation for Alma Linux and Rocky Linux #2053
Conversation
…or RHEL 9 Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
In addition to the fix changed in this PR, a test is being added to Github Actions to check for this error from now onwards. Even though other TestsAlma Linux 9
Red Hat Enterprise Linux 9
Rocky Linux 9
|
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
8c71106
to
8d49c5a
Compare
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
@@ -0,0 +1,28 @@ | |||
name: Test the enabling of the Wazuh agent - AlmaLinux 9 - RPM |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we define an array of RPM manager-supported operating systems and loop into it? And another one for the agent? Could you please add all manager-supported RPM operating systems?
In addition, it could be great if we test Debian too.
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
GitHub Actions Update
|
rpms/SPECS/wazuh-manager.spec
Outdated
@@ -332,7 +332,7 @@ fi | |||
|
|||
if [ -f /etc/os-release ]; then | |||
source /etc/os-release | |||
if [ "${NAME}" = "Red Hat Enterprise Linux" ] && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then | |||
if ( [ "${NAME}" = "Red Hat Enterprise Linux" ] || [ "${NAME}" = "Rocky Linux" ] || [ "${NAME}" = "AlmaLinux" ] ) && [ "$((${VERSION_ID:0:1}))" -ge 9 ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should also cover the corespondent versions of CentOS and Fedora, if possible we should use a generic command to determine these systems.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The generic command would be useful but the only common variable in /etc/os-release
is ID_LIKE
, which function is this type of things. The problem is it is also the same for Oracle Linux 9, which doesn't have this problem.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CentOS 9 Stream and Fedora 34 added in 08bd107
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
apt-get update | ||
apt-get install -y systemd | ||
else | ||
common_logger -e "Couldn'd find type of system" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please change Couldn'd
to Couldn't
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 24734fb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please review the comments
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Description
In this PR we propose a fix to the matter of enabling Wazuh service in RHEL 9 derived systems:
Logs example
Error:
Fixed:
Tests
RHEL 9
Rocky Linux 9
Alma Linux 9
Oracle Linux 9
CentOS 7