diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 278576bc4..e59e13539 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -2,6 +2,30 @@ This document provides a high-level view of the changes to the macOS Security Compliance Project. +== [Catalina, Revision 3] - 2021-03-18 + +* Rules +** Fixed Rules + +* Baselines +** Added DISA-STIG + +* Scripts +** generate_guidance +*** Bug fixes +*** Custom rules support added +*** Added ability to signed configuration profiles +*** Added plist generation for rules +*** Generates preferences files for compliance script +*** Compliance script enhancements +**** Exemption support +**** Modified plist behavior +**** Log rotation +*** Added Custom References +** yaml-to-oval +*** Bug fixes + + == [Catalina, Revision 2] - 2020-11-10 * Rules diff --git a/README.adoc b/README.adoc index e32787b6a..2c7f70e0c 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -image::templates/images/mscp_banner.png[] +image::templates/images/mscp_banner_outline.png[] // settings: :idprefix: :idseparator: - @@ -50,7 +50,6 @@ Part 39 of the Federal Acquisition Regulations, section 39.101 paragraph (c) sta |Joshua Glemza|National Aeronautics and Space Administration |Elyse Anderson|National Aeronautics and Space Administration |Gary Gapinski|National Aeronautics and Space Administration -|Paige Ramsey|Los Alamos National Laboratory |=== == Changelog diff --git a/VERSION.yaml b/VERSION.yaml index 6e7201e1a..af2088659 100644 --- a/VERSION.yaml +++ b/VERSION.yaml @@ -1,3 +1,3 @@ os: "10.15" -version: "Catalina, Revision 2" -date: "2020-11-10" +version: "Catalina, Revision 3" +date: "2021-03-18" diff --git a/scripts/generate_guidance.py b/scripts/generate_guidance.py index 796acca34..f831312e0 100755 --- a/scripts/generate_guidance.py +++ b/scripts/generate_guidance.py @@ -972,9 +972,9 @@ def get_rule_yaml(rule_file): if file_name in names: print(f"Custom settings found for rule: {rule_file}") try: - override_path = glob.glob('../custom/rules/**/{}'.format(file_name, recursive=True))[0] + override_path = glob.glob('../custom/rules/**/{}'.format(file_name), recursive=True)[0] except IndexError: - override_path = glob.glob('../custom/rules/{}'.format(file_name, recursive=True))[0] + override_path = glob.glob('../custom/rules/{}'.format(file_name), recursive=True)[0] with open(override_path) as r: rule_yaml = yaml.load(r, Loader=yaml.SafeLoader) else: diff --git a/templates/images/mscp_banner_outline.png b/templates/images/mscp_banner_outline.png new file mode 100644 index 000000000..57796de58 Binary files /dev/null and b/templates/images/mscp_banner_outline.png differ