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.

Sign up for GitHub

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

Jump to bottom

Swith to using tpldir macro #488

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Swith to using tpldir macro #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat1/RHEL-08-010150.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') %}
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat1/RHEL-08-no_pam_nullok.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/OL08-00-010159.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/OL08-00-010160.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010161.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010200.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010201.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010291.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010358.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010490.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010571.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010671.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010780.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-010790.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-020035.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-020040.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-020041.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-020090.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', []) %}
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-020180.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-020231.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-030590.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', []) %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-030740.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-040090.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-040123.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-040180.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-040282.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-040290.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-040342.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_faillock.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) %}
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat2/RHEL-08-pam_pwhistory.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) %}
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat3/RHEL-08-020042.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat3/RHEL-08-020340.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) %}
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat3/RHEL-08-030603.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat3/RHEL-08-030741.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/STIGbyID/cat3/RHEL-08-030742.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/VendorSTIG/packages.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ash-linux/el8/VendorSTIG/report.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading