Swith to using tpldir macro

plus3it · Mar 7, 2024 · 66a330c · 66a330c
1 parent a0601bf
commit 66a330c
Show file tree

Hide file tree

Showing 37 changed files with 37 additions and 37 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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