Skip to content

Commit

Permalink
Fix use of legacy facts
Browse files Browse the repository at this point in the history
Fixes #161
  • Loading branch information
silug committed Nov 26, 2024
1 parent a90181b commit cb9ef42
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Mon Nov 25 2024 Steven Pritchard <steve@sicura-us> - 7.3.1
- Fix use of legacy facts

* Mon Nov 04 2024 Mike Riddle <mike@sicura.us> - 7.3.0
- "root_unlock_time" will no longer be included in faillock.conf if "even_deny_root" is set to false
- Added nullok back as a parameter for completeness, however, users are warned not to use it unless
Expand Down
16 changes: 8 additions & 8 deletions SIMP/compliance_profiles/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ checks:
nist_800_53:rev4:
- AC-7:b
confine:
osfamily: RedHat
os.family: RedHat
oval:com.puppet.forge.simp.pam.cracklib_maxrepeat:
settings:
parameter: pam::cracklib_maxrepeat
Expand All @@ -439,7 +439,7 @@ checks:
- SRG-OS-000072-GPOS-00040
- CCI-000195
confine:
osfamily: RedHat
os.family: RedHat
oval:com.puppet.forge.simp.pam.even_deny_root:
settings:
parameter: pam::even_deny_root
Expand All @@ -458,8 +458,8 @@ checks:
- SRG-OS-000021-GPOS-00005
- CCI-002238
confine:
osfamily: RedHat
operatingsystemmajrelease: '7'
os.family: RedHat
os.release.major: '7'
oval:com.puppet.forge.simp.pam.hash_algorithm:
settings:
parameter: pam::hash_algorithm
Expand All @@ -476,8 +476,8 @@ checks:
- SRG-OS-000073-GPOS-00041
- CCI-000196
confine:
osfamily: RedHat
operatingsystemmajrelease: '7'
os.family: RedHat
os.release.major: '7'
oval:com.puppet.forge.simp.pam.unlock_time:
settings:
parameter: pam::unlock_time
Expand All @@ -494,8 +494,8 @@ checks:
- SRG-OS-000329-GPOS-00128
- CCI-002238
confine:
osfamily: RedHat
operatingsystemmajrelease: '7'
os.family: RedHat
os.release.major: '7'
oval-ids:
- xccdf_org:ssgproject:content_rule_accounts_passwords_pam_faillock_unlock_time
- accounts_passwords_pam_faillock_unlock_time
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-pam",
"version": "7.3.0",
"version": "7.3.1",
"author": "SIMP Team",
"summary": "A SIMP puppet module for managing pam",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/suites/default/00_default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
apply_manifest_on(host, manifest, {:catch_changes => true})
end

os_major = fact_on(host, 'operatingsystemmajrelease')
os_major = fact_on(host, 'os.release.major')

# Total hack to support Amazon without a bunch of logic
if ['7','2'].include?(os_major)
Expand Down

0 comments on commit cb9ef42

Please sign in to comment.