From 66a330cc3e49c7dbaa131f3a8069dab8150ed86f Mon Sep 17 00:00:00 2001 From: Thomas H Jones II Date: Thu, 7 Mar 2024 11:59:13 -0500 Subject: [PATCH] Swith to using tpldir macro --- ash-linux/el8/STIGbyID/cat1/RHEL-08-010150.sls | 2 +- ash-linux/el8/STIGbyID/cat1/RHEL-08-no_pam_nullok.sls | 2 +- ash-linux/el8/STIGbyID/cat2/OL08-00-010159.sls | 2 +- ash-linux/el8/STIGbyID/cat2/OL08-00-010160.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010161.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010200.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010201.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010291.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010358.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010490.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010571.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010671.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010780.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-010790.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-020035.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-020040.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-020041.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-020090.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-020180.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-020231.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-030590.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-030740.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-040090.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-040123.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-040180.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-040282.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-040290.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-040342.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_faillock.sls | 2 +- ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_pwhistory.sls | 2 +- ash-linux/el8/STIGbyID/cat3/RHEL-08-020042.sls | 2 +- ash-linux/el8/STIGbyID/cat3/RHEL-08-020340.sls | 2 +- ash-linux/el8/STIGbyID/cat3/RHEL-08-030603.sls | 2 +- ash-linux/el8/STIGbyID/cat3/RHEL-08-030741.sls | 2 +- ash-linux/el8/STIGbyID/cat3/RHEL-08-030742.sls | 2 +- ash-linux/el8/VendorSTIG/packages.sls | 2 +- ash-linux/el8/VendorSTIG/report.sls | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/ash-linux/el8/STIGbyID/cat1/RHEL-08-010150.sls b/ash-linux/el8/STIGbyID/cat1/RHEL-08-010150.sls index 305d27cd5..954743791 100644 --- a/ash-linux/el8/STIGbyID/cat1/RHEL-08-010150.sls +++ b/ash-linux/el8/STIGbyID/cat1/RHEL-08-010150.sls @@ -19,7 +19,7 @@ # ################################################################# {%- set stig_id = 'RHEL-08-010150' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat1/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set mustSet = salt.pillar.get('ash-linux:lookup:grub-passwd', '') %} {%- set grubUser = salt.pillar.get('ash-linux:lookup:grub-user', 'grubuser') %} diff --git a/ash-linux/el8/STIGbyID/cat1/RHEL-08-no_pam_nullok.sls b/ash-linux/el8/STIGbyID/cat1/RHEL-08-no_pam_nullok.sls index 82f53132f..66f3d1d8a 100644 --- a/ash-linux/el8/STIGbyID/cat1/RHEL-08-no_pam_nullok.sls +++ b/ash-linux/el8/STIGbyID/cat1/RHEL-08-no_pam_nullok.sls @@ -22,7 +22,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-no_pam_nullok' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat1/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} script_{{ stig_id }}-describe: diff --git a/ash-linux/el8/STIGbyID/cat2/OL08-00-010159.sls b/ash-linux/el8/STIGbyID/cat2/OL08-00-010159.sls index cc665f315..597cdba96 100644 --- a/ash-linux/el8/STIGbyID/cat2/OL08-00-010159.sls +++ b/ash-linux/el8/STIGbyID/cat2/OL08-00-010159.sls @@ -20,7 +20,7 @@ # ########################################################################### {%- set stig_id = 'OL08-00-010159' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/pam.d/system-auth' %} diff --git a/ash-linux/el8/STIGbyID/cat2/OL08-00-010160.sls b/ash-linux/el8/STIGbyID/cat2/OL08-00-010160.sls index fc310dd85..266eef71f 100644 --- a/ash-linux/el8/STIGbyID/cat2/OL08-00-010160.sls +++ b/ash-linux/el8/STIGbyID/cat2/OL08-00-010160.sls @@ -20,7 +20,7 @@ # ########################################################################### {%- set stig_id = 'OL08-00-010160' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/pam.d/password-auth' %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010161.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010161.sls index 52966b889..b9c555152 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010161.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010161.sls @@ -19,7 +19,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-010161' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set keytabList = salt.file.find('/etc', maxdepth=1, type='f', name='*.keytab') %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010200.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010200.sls index dba7ac968..f5342e2ac 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010200.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010200.sls @@ -23,7 +23,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-010200' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set svcName = 'sshd' %} {%- set cfgFile = '/etc/ssh/sshd_config' %} {%- set parmName = 'ClientAliveCountMax' %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010201.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010201.sls index 19d10de75..063b65e24 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010201.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010201.sls @@ -21,7 +21,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-010201' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set svcName = 'sshd' %} {%- set cfgFile = '/etc/ssh/sshd_config' %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010291.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010291.sls index 6b3571174..8b18ea39f 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010291.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010291.sls @@ -19,7 +19,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-010291' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set cfgFile = '/etc/crypto-policies/back-ends/opensshserver.config' %} {%- set fixOpts = [ diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010358.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010358.sls index f3885bbff..9208f8a69 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010358.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010358.sls @@ -17,7 +17,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-010358' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set mailRpms = [ 'mailx', diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010490.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010490.sls index bc015f7c1..b9b3879ec 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010490.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010490.sls @@ -19,7 +19,7 @@ # ################################################################# {%- set stig_id = 'RHEL-08-010490' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} # Log a description of what we're setting script_{{ stig_id }}-describe: diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010571.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010571.sls index 771b2a30c..72bb19d73 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010571.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010571.sls @@ -20,7 +20,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-010571' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set optionsFile ='/etc/systemd/system/boot.mount.d/options.conf' %} {%- set mntOpt = [ 'nosuid', diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010671.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010671.sls index 85b1549c3..58dcb0683 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010671.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010671.sls @@ -18,7 +18,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-010671' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set searchDirs =[ '/etc/sysctl.d/', diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010780.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010780.sls index 100ff457b..c2a80ea38 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010780.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010780.sls @@ -18,7 +18,7 @@ # ################################################################# {%- set stig_id = 'RHEL-08-010780' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set nouserFiles = [] %} {%- set localFstypes = [ diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010790.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010790.sls index 6c1a7c792..990e120d0 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-010790.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-010790.sls @@ -18,7 +18,7 @@ # ################################################################# {%- set stig_id = 'RHEL-08-010790' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set nogroupFiles = [] %} {%- set localFstypes = [ diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020035.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020035.sls index 8a0587ee4..e3c747049 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020035.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020035.sls @@ -18,7 +18,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-020035' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set cfgFile = '/etc/systemd/logind.conf' %} {%- set cfgParm = 'StopIdleSessionSec' %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020040.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020040.sls index e7413b412..cc8d80e89 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020040.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020040.sls @@ -21,7 +21,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-020040' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/tmux.conf' %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020041.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020041.sls index 0b77789b3..89d8a921c 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020041.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020041.sls @@ -24,7 +24,7 @@ # ################################################################# {%- set stig_id = 'RHEL-08-020041' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set profileFile ='/etc/profile.d/tmux.sh' %} # Log a description of what we're setting diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020090.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020090.sls index dd43088e6..cdc9d4dbf 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020090.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020090.sls @@ -19,5 +19,5 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-020090' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020180.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020180.sls index 941492841..11d53c41b 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020180.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020180.sls @@ -19,7 +19,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-020180' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set userList = salt.user.list_users() %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020231.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020231.sls index c54249c2d..9a31ec1df 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-020231.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-020231.sls @@ -19,7 +19,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-020231' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/login.defs' %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-030590.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-030590.sls index 8e196cdfa..02cf3b048 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-030590.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-030590.sls @@ -26,7 +26,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-030590' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set ruleFile = '/etc/audit/rules.d/logins.rules' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-030740.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-030740.sls index 751f927d5..ac181997d 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-030740.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-030740.sls @@ -17,7 +17,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-030740' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/chrony.conf' %} {%- set serverFile = '/etc/chrony.d/servers.conf' %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040090.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040090.sls index 57d8763fe..c6e0303d1 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040090.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040090.sls @@ -18,7 +18,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-040090' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set firewalldConf = '/etc/firewalld/firewalld.conf' %} {%- set firewalldParm = 'DefaultZone' %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040123.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040123.sls index ed6f299f5..b710d10d9 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040123.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040123.sls @@ -18,7 +18,7 @@ # ################################################################# {%- set stig_id = 'RHEL-08-040123' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set optionsFile ='/etc/systemd/system/tmp.mount.d/options.conf' %} {%- set mntOpt = [ 'nosuid', diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040180.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040180.sls index ae9eeb006..4ddaef7fa 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040180.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040180.sls @@ -18,7 +18,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-040180' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} script_{{ stig_id }}-describe: diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040282.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040282.sls index bf9f98781..bf20b2c7f 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040282.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040282.sls @@ -18,7 +18,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-040282' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set searchDirs =[ '/etc/sysctl.d/', diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040290.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040290.sls index daa289f60..c7d69dc16 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040290.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040290.sls @@ -18,7 +18,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-040290' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} script_{{ stig_id }}-describe: diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040342.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040342.sls index 8e55f14b5..02b98e1f2 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-040342.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-040342.sls @@ -19,7 +19,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-040342' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set cfgFile = '/etc/crypto-policies/back-ends/opensshserver.config' %} {%- set fixOpts = [ diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_faillock.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_faillock.sls index b0a4c0132..db7f0f4b5 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_faillock.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_faillock.sls @@ -49,7 +49,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-pam_faillock' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set faillock_cfg_file = '/etc/security/faillock.conf' %} {%- set faillock_deny_count = salt.pillar.get('ash-linux:lookup:pam_stuff:faillock_deny_count', 3) %} diff --git a/ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_pwhistory.sls b/ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_pwhistory.sls index 1495c094c..c5721ad75 100644 --- a/ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_pwhistory.sls +++ b/ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_pwhistory.sls @@ -19,7 +19,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-pam_pwhistory' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat2/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set pwhistory_cfg_file = '/etc/security/pwhistory.conf' %} {%- set pwhistory_remember = salt.pillar.get('ash-linux:lookup:pam_stuff:pwhistory_remember', 5) %} diff --git a/ash-linux/el8/STIGbyID/cat3/RHEL-08-020042.sls b/ash-linux/el8/STIGbyID/cat3/RHEL-08-020042.sls index 761581f06..a1c82f1e8 100644 --- a/ash-linux/el8/STIGbyID/cat3/RHEL-08-020042.sls +++ b/ash-linux/el8/STIGbyID/cat3/RHEL-08-020042.sls @@ -19,7 +19,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-020042' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat3/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/shells' %} diff --git a/ash-linux/el8/STIGbyID/cat3/RHEL-08-020340.sls b/ash-linux/el8/STIGbyID/cat3/RHEL-08-020340.sls index 9e08e7274..8a66786a8 100644 --- a/ash-linux/el8/STIGbyID/cat3/RHEL-08-020340.sls +++ b/ash-linux/el8/STIGbyID/cat3/RHEL-08-020340.sls @@ -19,7 +19,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-020340' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat3/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/pam.d/postlogin' %} {%- if salt.file.is_link(targFile) %} diff --git a/ash-linux/el8/STIGbyID/cat3/RHEL-08-030603.sls b/ash-linux/el8/STIGbyID/cat3/RHEL-08-030603.sls index 3f4b45e46..b9233897b 100644 --- a/ash-linux/el8/STIGbyID/cat3/RHEL-08-030603.sls +++ b/ash-linux/el8/STIGbyID/cat3/RHEL-08-030603.sls @@ -18,7 +18,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-030603' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat3/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/usbguard/usbguard-daemon.conf' %} diff --git a/ash-linux/el8/STIGbyID/cat3/RHEL-08-030741.sls b/ash-linux/el8/STIGbyID/cat3/RHEL-08-030741.sls index cc529aa90..b6d5fafa8 100644 --- a/ash-linux/el8/STIGbyID/cat3/RHEL-08-030741.sls +++ b/ash-linux/el8/STIGbyID/cat3/RHEL-08-030741.sls @@ -18,7 +18,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-030741' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat3/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/chrony.conf' %} diff --git a/ash-linux/el8/STIGbyID/cat3/RHEL-08-030742.sls b/ash-linux/el8/STIGbyID/cat3/RHEL-08-030742.sls index 5d488bf53..53c924640 100644 --- a/ash-linux/el8/STIGbyID/cat3/RHEL-08-030742.sls +++ b/ash-linux/el8/STIGbyID/cat3/RHEL-08-030742.sls @@ -18,7 +18,7 @@ # ########################################################################### {%- set stig_id = 'RHEL-08-030742' %} -{%- set helperLoc = 'ash-linux/el8/STIGbyID/cat3/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set skipIt = salt.pillar.get('ash-linux:lookup:skip-stigs', []) %} {%- set targFile = '/etc/chrony.conf' %} diff --git a/ash-linux/el8/VendorSTIG/packages.sls b/ash-linux/el8/VendorSTIG/packages.sls index aa070d8bd..c6ea3db7e 100644 --- a/ash-linux/el8/VendorSTIG/packages.sls +++ b/ash-linux/el8/VendorSTIG/packages.sls @@ -4,7 +4,7 @@ # ################################################################# {%- set stig_id = 'VendorSTIG-top' %} -{%- set helperLoc = 'ash-linux-formula/ash-linux/el8/VendorSTIG/files' %} +{%- set helperLoc = tpldir ~ '/files' %} packages_{{ stig_id }}-installed: pkg.installed: diff --git a/ash-linux/el8/VendorSTIG/report.sls b/ash-linux/el8/VendorSTIG/report.sls index 1cff91094..60a0893af 100644 --- a/ash-linux/el8/VendorSTIG/report.sls +++ b/ash-linux/el8/VendorSTIG/report.sls @@ -4,7 +4,7 @@ # ################################################################# {%- set stig_id = 'VendorSTIG-top' %} -{%- set helperLoc = 'ash-linux-formula/ash-linux/el8/VendorSTIG/files' %} +{%- set helperLoc = tpldir ~ '/files' %} {%- set repDir = salt.pillar.get('ash-linux:lookup:scap-output') | default( '/var/tmp', true