diff --git a/docs/README.md b/docs/README.md index 38aef37..26a6f9b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -43,7 +43,6 @@ make singlehtml The file(s) that need to be adjusted are -- source/benchmarks_CIS.rst - source/benchmarks_STIG.rst This auto populates into the index and anywhere else it is required diff --git a/docs/source/CIS/CIS_table.rst b/docs/source/CIS/CIS_table.rst index 40cb16e..6381caf 100644 --- a/docs/source/CIS/CIS_table.rst +++ b/docs/source/CIS/CIS_table.rst @@ -9,6 +9,8 @@ Operating Systems :widths: 25, 15, 15, 15, 25 "AMAZON2-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/AMAZON2-CIS?style=plastic" + "AMAZON2023-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/AMAZON2023-CIS?style=plastic" + "DEBIAN11-CIS_", "True", "True", "WIP", "N/A" "RHEL7-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL7-CIS?style=plastic" "RHEL8-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL8-CIS?style=plastic" "RHEL9-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL9-CIS?style=plastic" @@ -20,9 +22,11 @@ Operating Systems :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release" :widths: 25, 15, 15, 15, 25 + "Windows-10-CIS_", "True", "True", "WIP", "N/A" + "Windows-11-CIS_", "True", "True", "WIP", "N/A" "Windows-2016-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Windows-2016-CIS?style=plastic" "Windows-2019-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Windows-2019-CIS?style=plastic" - "Windows-2022-CIS_", "True", "WIP", "WIP", "N/A" + "Windows-2022-CIS_", "True", "True", "WIP", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Windows-2022-CIS?style=plastic" Cloud Platforms ^^^^^^^^^^^^^^^^^ @@ -53,6 +57,7 @@ None currently .. _AMAZON2-CIS: https://github.com/ansible-lockdown/AMAZON2-CIS .. _AMAZON2023-CIS: https://github.com/ansible-lockdown/AMAZON2023-CIS +.. _DEBIAN11-CIS: https://github.com/ansible-lockdown/DEBIAN11-CIS .. _RHEL7-CIS: https://github.com/ansible-lockdown/RHEL7-CIS .. _RHEL8-CIS: https://github.com/ansible-lockdown/RHEL8-CIS .. _RHEL9-CIS: https://github.com/ansible-lockdown/RHEL9-CIS @@ -63,6 +68,8 @@ None currently .. _Windows-2016-CIS: https://github.com/ansible-lockdown/Windows-2016-CIS .. _Windows-2019-CIS: https://github.com/ansible-lockdown/Windows-2019-CIS .. _Windows-2022-CIS: https://github.com/ansible-lockdown/Windows-2022-CIS +.. _Windows-10-CIS: https://github.com/ansible-lockdown/Windows-10-CIS +.. _Windows-11-CIS: https://github.com/ansible-lockdown/Windows-11-CIS .. _Cisco-IOS-L2S: https://github.com/ansible-lockdown/CISCO-IOS-L2S-STIG .. _AWS-Foundations: https://github.com/ansible-lockdown/AWS-FOUNDATIONS-CIS diff --git a/docs/source/CIS/benchmarks_CIS.rst b/docs/source/CIS/benchmarks_CIS.rst deleted file mode 100644 index f008e5e..0000000 --- a/docs/source/CIS/benchmarks_CIS.rst +++ /dev/null @@ -1,69 +0,0 @@ -CIS Benchmarks --------------- - -Operating Systems -^^^^^^^^^^^^^^^^^ - -Amazon -~~~~~~ - - AMAZON2-CIS_ - -RedHat Enterprise Linux -~~~~~~~~~~~~~~~~~~~~~~~ - - - RHEL7-CIS_ - - RHEL8-CIS_ - - RHEL9-CIS_ - -Ubuntu -~~~~~~ - - - UBUNTU18-CIS_ - - UBUNTU20-CIS_ - - UBUNTU22-CIS_ - -Windows -~~~~~~~ - - - Windows-2016-CIS_ - - Windows-2019-CIS_ - - Windows-2022-CIS_ - -Platform -^^^^^^^^ - - - AWS-Foundations_ - - Azure-CIS_ - -Applications -^^^^^^^^^^^^ - - - Apache-2.4-CIS_ - - Postgres-12-CIS_ - - Kubernetes1.6.1-CIS_ - - -Archived Roles (No Longer Maintained) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -None currently - -.. _AMAZON2-CIS: https://github.com/ansible-lockdown/AMAZON2-CIS -.. _RHEL7-CIS: https://github.com/ansible-lockdown/RHEL7-CIS -.. _RHEL8-CIS: https://github.com/ansible-lockdown/RHEL8-CIS -.. _RHEL9-CIS: https://github.com/ansible-lockdown/RHEL9-CIS -.. _UBUNTU18-CIS: https://github.com/ansible-lockdown/UBUNTU18-CIS -.. _UBUNTU20-CIS: https://github.com/ansible-lockdown/UBUNTU20-CIS -.. _UBUNTU22-CIS: https://github.com/ansible-lockdown/UBUNTU22-CIS - - -.. _Windows-2016-CIS: https://github.com/ansible-lockdown/Windows-2016-CIS -.. _Windows-2019-CIS: https://github.com/ansible-lockdown/Windows-2019-CIS -.. _Windows-2022-CIS: https://github.com/ansible-lockdown/Windows-2022-CIS - -.. _Cisco-IOS-L2S: https://github.com/ansible-lockdown/CISCO-IOS-L2S-STIG -.. _AWS-Foundations: https://github.com/ansible-lockdown/AWS-FOUNDATIONS-CIS -.. _Azure-CIS: https://github.com/ansible-lockdown/AZURE-CIS - -.. _Apache-2.4-CIS: https://github.com/ansible-lockdown/APACHE-2.4-CIS -.. _Postgres-12-CIS: https://github.com/ansible-lockdown/POSTGRES-12-CIS -.. _Kubernetes1.6.1-CIS: https://github.com/ansible-lockdown/Kubernetes1.6.1-CIS diff --git a/docs/source/STIG/benchmarks_STIG.rst b/docs/source/STIG/benchmarks_STIG.rst deleted file mode 100644 index f6d412c..0000000 --- a/docs/source/STIG/benchmarks_STIG.rst +++ /dev/null @@ -1,56 +0,0 @@ -STIG Benchmarks ---------------- - -Operating Systems -^^^^^^^^^^^^^^^^^ - -RedHat Enterprise Linux -~~~~~~~~~~~~~~~~~~~~~~~ - - - RHEL7-STIG_ - - RHEL8-STIG_ - -Windows -~~~~~~~ - - - Windows-10-STIG_ - - Windows-2016-STIG_ - - Windows-2019-STIG_ - - Windows-2022-STIG_ - -Hardware -^^^^^^^^ - -- Cisco-IOS-L2S_ - -Applications -^^^^^^^^^^^^ - -- Apache-2.4-STIG_ -- Postgres-9-STIG_ -- Windows_Advance_Firewall-STIG_ - -Archived Roles (No Longer Maintained) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -- RHEL5 -- RHEL6 -- 2008R2-Member -- Windows-2012-Member-Server-STIG_ -- Windows-2012-Domain-Controller-STIG_ - - - -.. _RHEL7-STIG: https://github.com/ansible-lockdown/RHEL7-STIG -.. _RHEL8-STIG: https://github.com/ansible-lockdown/RHEL8-STIG -.. _Windows-10-STIG: https://github.com/ansible-lockdown/Windows-10-STIG -.. _Windows-2012-Member-Server-STIG: https://github.com/ansible-lockdown/Windows-2012-Member-Server-STIG -.. _Windows-2012-Domain-Controller-STIG: https://github.com/ansible-lockdown/Windows-2012-Domain-Controller-STIG -.. _Windows-2016-STIG: https://github.com/ansible-lockdown/Windows-2016-STIG -.. _Windows-2019-STIG: https://github.com/ansible-lockdown/Windows-2019-STIG -.. _Windows-2022-STIG: https://github.com/ansible-lockdown/Windows-2022-STIG - - -.. _Apache-2.4-STIG: https://github.com/ansible-lockdown/APACHE-2.4-STIG -.. _Postgres-9-STIG: https://github.com/ansible-lockdown/POSTGRES-9-STIG -.. _Windows_Advance_Firewall-STIG: https://github.com/ansible-lockdown/WinFWADV-STIG diff --git a/docs/source/combined/release_sched.rst b/docs/source/combined/release_sched.rst new file mode 100644 index 0000000..0f03a83 --- /dev/null +++ b/docs/source/combined/release_sched.rst @@ -0,0 +1,31 @@ +Release schedule +================ + +Vendor Benchmark Schedule +------------------------- + +CIS +^^^ + +CIS (Center for Internet Security) release developed security configurations best practices that are validated by community. There is no official schedule, although CIS tends to release new or updated benchmarks into a draft format, which you can subscribe prior to official release. + +STIG +^^^^ + +STIG (Security Technical Implementation Guide) releases are developed by vendors in conjunction with requirements from DISA. STIG release schedule is managed and released on a quarterly schedule. + +Playbook releases +^^^^^^^^^^^^^^^^^ + +We aim to release remediate benchmarks within 30 days of vendor release to subscribers, this is subject to number of changes, with new benchmarks often taking significantly longer. Public releases will be approximately three months after subscriber release. + +Example +^^^^^^^ + +.. csv-table:: Example Release Schedule for updated benchmarks + :header: "Benchmark", "Vendor Release", "Subscriber release", "Public Release" + :widths: 25, 25, 25, 25 + + "RHEL8-STIG", "27th January", "27th February", "27th May" + +Becoming a subscriber is simple, visit https://lockdownenterprise.com for more information. diff --git a/docs/source/index.rst b/docs/source/index.rst index 5a1e814..e29c981 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -19,6 +19,7 @@ Documentation :maxdepth: 2 :caption: Available Content + combined/release_sched.rst CIS/CIS_table.rst CIS/CIS_advanced.rst STIG/STIG_table.rst @@ -40,4 +41,4 @@ Documentation :caption: Reference & Appendices glossary.rst - links.rst \ No newline at end of file + links.rst diff --git a/docs/source/intro.rst b/docs/source/intro.rst index b8ab9f9..94086f4 100644 --- a/docs/source/intro.rst +++ b/docs/source/intro.rst @@ -8,7 +8,7 @@ Automated Security Benchmark - Auditing and Remediation :target: https://github.com/ansible-lockdown .. image:: https://img.shields.io/discord/925818806838919229?logo=discord - :target: https://discord.io/ansible-lockdown/ + :target: https://www.lockdownenterprise.com/discord MindPoint Group's (MPG_) Ansible-Lockdown Overview diff --git a/docs/source/remediate/rem-faq.rst b/docs/source/remediate/rem-faq.rst index 75994ed..f8a1b13 100644 --- a/docs/source/remediate/rem-faq.rst +++ b/docs/source/remediate/rem-faq.rst @@ -10,7 +10,7 @@ Missing "jmespath" Fatal Error This can occur during a playbook run on certain operating systems when patching takes place as part of the playbook due to the way python is implemented. -* `You Need to install jmespath `_ : A great article and explaination written by discord community member baassssiiee +* `You Need to install jmespath `_ : A great article and explanation written by Discord community member baassssiiee Missing Sudo Password (Linux OS Based) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/source/support.rst b/docs/source/support.rst index 4f6962b..487be3b 100644 --- a/docs/source/support.rst +++ b/docs/source/support.rst @@ -3,7 +3,7 @@ Getting Support Contact Us ^^^^^^^^^^ -* `Discord Community Discussions `_ : Our Discord channels are direct community communications for all aspects of the Ansible-Lockdown repositories. +* `Discord Community Discussions `_ : Our Discord channels are direct community communications for all aspects of the Ansible-Lockdown repositories. * `MindPoint Group Official Subscription `_ : If your organization requires you to have support, signed releases, or validated testing, those options are available.