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

Revert "fix: aide/remediations: add crontabs" #10766

Merged
merged 1 commit into from
Jun 29, 2023

Conversation

dodys
Copy link
Contributor

@dodys dodys commented Jun 29, 2023

Description:

Rationale:

@dodys dodys requested review from a team June 29, 2023 10:19
@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
bash remediation for rule 'xccdf_org.ssgproject.content_rule_aide_periodic_cron_checking' differs.
--- xccdf_org.ssgproject.content_rule_aide_periodic_cron_checking
+++ xccdf_org.ssgproject.content_rule_aide_periodic_cron_checking
@@ -3,9 +3,6 @@
 
 if ! rpm -q --quiet "aide" ; then
     yum install -y "aide"
-fi
-if ! rpm -q --quiet "crontabs" ; then
-    yum install -y "crontabs"
 fi
 
 if ! grep -q "/usr/sbin/aide --check" /etc/crontab ; then

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_aide_periodic_cron_checking' differs.
--- xccdf_org.ssgproject.content_rule_aide_periodic_cron_checking
+++ xccdf_org.ssgproject.content_rule_aide_periodic_cron_checking
@@ -1,9 +1,9 @@
 - name: Ensure AIDE is installed
   package:
-    name:
-    - aide
-    - crontabs
+    name: '{{ item }}'
     state: present
+  with_items:
+  - aide
   when: ansible_virtualization_type not in ["docker", "lxc", "openvz", "podman", "container"]
   tags:
   - CCE-80676-0

bash remediation for rule 'xccdf_org.ssgproject.content_rule_aide_scan_notification' differs.
--- xccdf_org.ssgproject.content_rule_aide_scan_notification
+++ xccdf_org.ssgproject.content_rule_aide_scan_notification
@@ -3,9 +3,6 @@
 
 if ! rpm -q --quiet "aide" ; then
     yum install -y "aide"
-fi
-if ! rpm -q --quiet "crontabs" ; then
-    yum install -y "crontabs"
 fi
 var_aide_scan_notification_email=''
 

ansible remediation for rule 'xccdf_org.ssgproject.content_rule_aide_scan_notification' differs.
--- xccdf_org.ssgproject.content_rule_aide_scan_notification
+++ xccdf_org.ssgproject.content_rule_aide_scan_notification
@@ -6,10 +6,10 @@
 
 - name: Ensure AIDE is installed
   package:
-    name:
-    - aide
-    - crontabs
+    name: '{{ item }}'
     state: present
+  with_items:
+  - aide
   when: ansible_virtualization_type not in ["docker", "lxc", "openvz", "podman", "container"]
   tags:
   - CCE-82891-3

@codeclimate
Copy link

codeclimate bot commented Jun 29, 2023

Code Climate has analyzed commit 8f31dae 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 53.4% (0.0% change).

View more on Code Climate.

@dodys
Copy link
Contributor Author

dodys commented Jun 29, 2023

only failed test does not seem related to this PR.

@Mab879 Mab879 self-assigned this Jun 29, 2023
@Mab879 Mab879 added this to the 0.1.69 milestone Jun 29, 2023
@Mab879 Mab879 added the bugfix Fixes to reported bugs. label Jun 29, 2023
@Mab879
Copy link
Member

Mab879 commented Jun 29, 2023

Waving the automatus test as it does not appear to be related.

@Mab879 Mab879 merged commit a8cbee6 into ComplianceAsCode:master Jun 29, 2023
@dodys dodys deleted the aide branch July 20, 2023 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Fixes to reported bugs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ubuntu 22.04: package requirement missmatch for AIDE
2 participants