Skip to content
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

Update package name for RHEL in package_rsync_removed #10053

Merged

Conversation

marcusburghardt
Copy link
Member

Description:

For RHEL8 and RHEL9, the rsync daemon is delivered by the rsync-daemon package.

Rationale:

Fix package name for RHEL8 and RHEL9.

@marcusburghardt marcusburghardt added bugfix Fixes to reported bugs. Update Rule Issues or pull requests related to Rules updates. labels Jan 12, 2023
@marcusburghardt marcusburghardt added this to the 0.1.66 milestone Jan 12, 2023
@github-actions
Copy link

Start a new ephemeral environment with changes proposed in this pull request:

rhel8 (from CTF) Environment (using Fedora as testing environment)
Open in Gitpod

Fedora Testing Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@github-actions
Copy link

This datastream diff is auto generated by the check Compare DS/Generate Diff

Click here to see the full diff
New content has different text for rule 'xccdf_org.ssgproject.content_rule_package_rsync_removed'.
--- xccdf_org.ssgproject.content_rule_package_rsync_removed
+++ xccdf_org.ssgproject.content_rule_package_rsync_removed
@@ -4,9 +4,9 @@
 
 [description]:
 The rsyncd service can be used to synchronize files between systems over network links.
-The rsync package can be removed with the following command:
+The rsync-daemon package can be removed with the following command:
 
-$ sudo yum erase rsync
+$ sudo yum erase rsync-daemon
 
 [reference]:
 2.2.20

OVAL for rule 'xccdf_org.ssgproject.content_rule_package_rsync_removed' differs.
--- oval:ssg-package_rsync_removed:def:1
+++ oval:ssg-package_rsync_removed:def:1
@@ -1,2 +1,2 @@
 criteria None
-criterion oval:ssg-test_package_rsync_removed:tst:1
+criterion oval:ssg-test_package_rsync-daemon_removed:tst:1

OCIL for rule 'xccdf_org.ssgproject.content_rule_package_rsync_removed' differs.
--- ocil:ssg-package_rsync_removed_ocil:questionnaire:1
+++ ocil:ssg-package_rsync_removed_ocil:questionnaire:1
@@ -1,4 +1,4 @@
-Run the following command to determine if the rsync package is installed:
-$ rpm -q rsync
+Run the following command to determine if the rsync-daemon package is installed:
+$ rpm -q rsync-daemon
 Is it the case that the package is installed?
 
bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_rsync_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_rsync_removed
+++ xccdf_org.ssgproject.content_rule_package_rsync_removed
@@ -1,12 +1,12 @@
 
-# CAUTION: This remediation script will remove rsync
+# CAUTION: This remediation script will remove rsync-daemon
 # from the system, and may remove any packages
-# that depend on rsync. Execute this
+# that depend on rsync-daemon. Execute this
 # remediation AFTER testing on a non-production
 # system!
 
-if rpm -q --quiet "rsync" ; then
+if rpm -q --quiet "rsync-daemon" ; then
 
- yum remove -y "rsync"
+ yum remove -y "rsync-daemon"
 
 fi

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_package_rsync_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_rsync_removed
+++ xccdf_org.ssgproject.content_rule_package_rsync_removed
@@ -1,6 +1,6 @@
-- name: Ensure rsync is removed
+- name: Ensure rsync-daemon is removed
 package:
- name: rsync
+ name: rsync-daemon
 state: absent
 tags:
 - CCE-86335-7

puppet remediation for rule 'xccdf_org.ssgproject.content_rule_package_rsync_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_rsync_removed
+++ xccdf_org.ssgproject.content_rule_package_rsync_removed
@@ -1,7 +1,7 @@
-include remove_rsync
+include remove_rsync-daemon
 
-class remove_rsync {
- package { 'rsync':
+class remove_rsync-daemon {
+ package { 'rsync-daemon':
 ensure => 'purged',
 }
 }

anaconda remediation for rule 'xccdf_org.ssgproject.content_rule_package_rsync_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_rsync_removed
+++ xccdf_org.ssgproject.content_rule_package_rsync_removed
@@ -1,2 +1,2 @@
 
-package --remove=rsync
+package --remove=rsync-daemon

@codeclimate
Copy link

codeclimate bot commented Jan 12, 2023

Code Climate has analyzed commit dfa54ae and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 49.9% (0.0% change).

View more on Code Climate.

@vojtapolasek vojtapolasek self-assigned this Jan 12, 2023
Copy link
Collaborator

@vojtapolasek vojtapolasek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you.

@vojtapolasek vojtapolasek merged commit 4982ed7 into ComplianceAsCode:master Jan 12, 2023
@marcusburghardt marcusburghardt deleted the package_rsync_removed branch January 12, 2023 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Fixes to reported bugs. Update Rule Issues or pull requests related to Rules updates.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants