Merge pull request #18 from ansible-lockdown/devel

New RTD config and anasible galaxy removal
ansible-lockdown · Oct 4, 2023 · ea8e638 · ea8e638
2 parents 4f3ac80 + 4689237
commit ea8e638
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 24 deletions.
diff --git a/docs/.readthedocs.yaml → .readthedocs.yaml b/docs/.readthedocs.yaml → .readthedocs.yaml
@@ -1,16 +1,18 @@
 version: 2
 
 build:
-  os: "ubuntu-20.04"
+  os: "ubuntu-22.04"
   tools:
     python: "3.11"
+
 python:
   # Install our python package before building the docs
   install:
-    - method: pip
-      path: .
+    - requirements: requirements/requirements.txt
+
 sphinx:
-  fail_on_warning: true
+  configuration: docs/source/conf.py
+
 formats:
   - pdf
   - epub
diff --git a/docs/source/CIS/CIS_table.rst b/docs/source/CIS/CIS_table.rst
@@ -5,24 +5,24 @@ Operating Systems
 ^^^^^^^^^^^^^^^^^
 
 .. csv-table:: CIS Linux Benchmark Availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Ansible Galaxy", "Release"
-   :widths: 25, 15, 15, 15, 25, 25
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release"
+   :widths: 25, 15, 15, 15, 25
 
-   "AMAZON2-CIS_", "True", "True", "True",  ".. image:: https://img.shields.io/ansible/quality/61757?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/AMAZON2-CIS?style=plastic"
-   "RHEL7-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/56324?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL7-CIS?style=plastic"
-   "RHEL8-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/56380?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL8-CIS?style=plastic"
-   "RHEL9-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/61781?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL9-CIS?style=plastic"
-   "UBUNTU18-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/54776?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU18-CIS?style=plastic"
-   "UBUNTU20-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/54777?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU20-CIS?style=plastic"
-   "UBUNTU22-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/62237?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU22-CIS?style=plastic"
+   "AMAZON2-CIS_", "True", "True", "True",  ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/AMAZON2-CIS?style=plastic"
+   "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"
+   "UBUNTU18-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU18-CIS?style=plastic"
+   "UBUNTU20-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU20-CIS?style=plastic"
+   "UBUNTU22-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU22-CIS?style=plastic"
 
 .. csv-table:: CIS Windows Benchmark Availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Ansible Galaxy",  "Release"
-   :widths: 25, 15, 15, 15, 25, 25
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release"
+   :widths: 25, 15, 15, 15, 25
 
-   "Windows-2016-CIS_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/55061?label=Quality&&logo=ansible", ".. 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/ansible/quality/56324?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/Windows-2019-CIS?style=plastic"
-   "Windows-2022-CIS_", "True", "WIP", "WIP", ".. image:: https://img.shields.io/ansible/quality/1?label=Quality&&logo=ansible", "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"
 
 Cloud Platforms
 ^^^^^^^^^^^^^^^^^
@@ -52,6 +52,7 @@ Archived Roles
 None currently
 
 .. _AMAZON2-CIS: https://github.com/ansible-lockdown/AMAZON2-CIS
+.. _AMAZON2023-CIS: https://github.com/ansible-lockdown/AMAZON2023-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

diff --git a/docs/source/STIG/STIG_table.rst b/docs/source/STIG/STIG_table.rst
@@ -5,12 +5,12 @@ Operating Systems
 ^^^^^^^^^^^^^^^^^
 
 .. csv-table:: STIG Linux Benchmark Availability
-   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Ansible Galaxy", "Release"
-   :widths: 25, 15, 15, 15, 25, 25
+   :header: "Benchmark", "Maintained", "Remediate", "Audit", "Release"
+   :widths: 25, 15, 15, 15, 25
 
-   "RHEL7-STIG_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/61792?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL7-STIG?style=plastic"
-   "RHEL8-STIG_", "True", "True", "True", ".. image:: https://img.shields.io/ansible/quality/56380?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL8-STIG?style=plastic"
-   "UBUNTU18-STIG_", "True", "True", "WIP", ".. image:: https://img.shields.io/ansible/quality/61237?label=Quality&&logo=ansible", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU18-STIG?style=plastic"
+   "RHEL7-STIG_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL7-STIG?style=plastic"
+   "RHEL8-STIG_", "True", "True", "True", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/RHEL8-STIG?style=plastic"
+   "UBUNTU18-STIG_", "True", "True", "WIP", ".. image:: https://img.shields.io/github/v/release/ansible-lockdown/UBUNTU18-STIG?style=plastic"
    "UBUNTU20-STIG_", "True", "True", "WIP", "N/A", "N/A"
 
 .. csv-table:: STIG Windows Benchmark Availability

diff --git a/docs/requirements.txt → requirements/requirements.txt b/docs/requirements.txt → requirements/requirements.txt
@@ -7,4 +7,4 @@ sphinx>2.25.0
 sphinx_rtd_theme
 Jinja2
 PyYAML
-urllib3==1.26.15
+urllib3>1.26.17