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

SLE add ability to configure emergency via dropin #10482

Conversation

teacup-on-rockingchair
Copy link
Contributor

Description:

  • For SLE platforms add the possibilty to configure the emergency target auth via drop-in configuration file, rather than directly in the /usr/lib/systemd.. unit

Rationale:

  • Modify OVAL check to allow drop-in configuration in /etc/systemd/system/...
  • Modify ansible and bash remediations to perform the remediation in a drop-in file rather directly edit the /usr/lib unit file

@teacup-on-rockingchair teacup-on-rockingchair marked this pull request as draft April 24, 2023 04:42
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Apr 24, 2023
@teacup-on-rockingchair teacup-on-rockingchair added Ansible Ansible remediation update. Bash Bash remediation update. SLES SUSE Linux Enterprise Server product related. labels Apr 24, 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
bash remediation for rule 'xccdf_org.ssgproject.content_rule_require_emergency_target_auth' differs.
--- xccdf_org.ssgproject.content_rule_require_emergency_target_auth
+++ xccdf_org.ssgproject.content_rule_require_emergency_target_auth
@@ -3,7 +3,9 @@
 
 service_file="/usr/lib/systemd/system/emergency.service"
 
+
 sulogin="/usr/lib/systemd/systemd-sulogin-shell emergency"
+
 
 if grep "^ExecStart=.*" "$service_file" ; then
 sed -i "s%^ExecStart=.*%ExecStart=-$sulogin%" "$service_file"

@teacup-on-rockingchair teacup-on-rockingchair marked this pull request as ready for review April 24, 2023 05:26
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Apr 24, 2023
@teacup-on-rockingchair teacup-on-rockingchair marked this pull request as draft April 24, 2023 06:18
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Apr 24, 2023
@teacup-on-rockingchair teacup-on-rockingchair marked this pull request as ready for review April 26, 2023 04:16
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Apr 26, 2023
@marcusburghardt
Copy link
Member

@teacup-on-rockingchair could you rebase this PR with the current master, please? This should solve the failed CI tests. Thanks

For SLE platforms add the possibilty to configure the emergency target auth via drop-in configuration file,
rather than directly in the /usr/lib/systemd.. unit
@marcusburghardt marcusburghardt self-assigned this May 5, 2023
@marcusburghardt marcusburghardt added this to the 0.1.68 milestone May 5, 2023
@codeclimate
Copy link

codeclimate bot commented May 9, 2023

Code Climate has analyzed commit 02f4dc8 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 52.4% (0.0% change).

View more on Code Climate.

@marcusburghardt marcusburghardt merged commit 5827fbe into ComplianceAsCode:master May 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ansible Ansible remediation update. Bash Bash remediation update. SLES SUSE Linux Enterprise Server product related.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants