Merge pull request #21 from ansible-lockdown/devel

Release to live
ansible-lockdown · Oct 5, 2023 · 87460e0 · 87460e0
2 parents ea8e638 + db6d993
commit 87460e0
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 131 deletions.
diff --git 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
@@ -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
diff --git a/docs/source/STIG/benchmarks_STIG.rst b/docs/source/STIG/benchmarks_STIG.rst
diff --git a/docs/source/combined/release_sched.rst 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
@@ -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
+   links.rst
diff --git 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
@@ -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 <https://serverfault.com/questions/1114638/ansible-you-need-to-install-jmespath-prior-to-running-json-query-filter-bu>`_ : A great article and explaination written by discord community member baassssiiee
+* `You Need to install jmespath <https://serverfault.com/questions/1114638/ansible-you-need-to-install-jmespath-prior-to-running-json-query-filter-bu>`_ : 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
@@ -3,7 +3,7 @@ Getting Support
 
 Contact Us
 ^^^^^^^^^^
-* `Discord Community Discussions <https://discord.io/ansible-lockdown>`_ : Our Discord channels are direct community communications for all aspects of the Ansible-Lockdown repositories.
+* `Discord Community Discussions <https://www.lockdownenterprise.com/discord>`_ : Our Discord channels are direct community communications for all aspects of the Ansible-Lockdown repositories.
 
 * `MindPoint Group Official Subscription <https://www.lockdownenterprise.com/>`_ : If your organization requires you to have support, signed releases, or validated testing, those options are available.