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

New RTD config and ansible galaxy removal #18

Merged
merged 16 commits into from
Oct 4, 2023
Merged

New RTD config and ansible galaxy removal #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b145cef
Update CIS table with Amazon2023
frederickw082922 Aug 23, 2023
4e2b4be
Update CIS table with Amazon2023-2
frederickw082922 Aug 23, 2023
968c7b8
updated urllib3 version
uk-bolly Oct 3, 2023
5837186
removed quality label due to galaxy update
uk-bolly Oct 3, 2023
1afad89
Fix Build -1
frederickw082922 Oct 3, 2023
eb8fe37
Fix Build -2
frederickw082922 Oct 3, 2023
c8348e0
Fix Build -3
frederickw082922 Oct 3, 2023
14c815c
Fix Build -4
frederickw082922 Oct 3, 2023
2a0e244
Fix Build -5
frederickw082922 Oct 3, 2023
d8b4766
Fix Build -6
frederickw082922 Oct 3, 2023
939eefb
Fix Build -7
frederickw082922 Oct 3, 2023
87eb305
Fix Build -8
frederickw082922 Oct 3, 2023
f89275d
tidy up merge conflicts
uk-bolly Oct 4, 2023
9b5962b
updated spacing
uk-bolly Oct 4, 2023
442aa73
updated to greater than
uk-bolly Oct 4, 2023
4689237
Merge pull request #17 from ansible-lockdown/2023_FAQ
frederickw082922 Oct 4, 2023
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
10 changes: 6 additions & 4 deletions docs/.readthedocs.yaml → .readthedocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
29 changes: 15 additions & 14 deletions docs/source/CIS/CIS_table.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
^^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions docs/source/STIG/STIG_table.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt → requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ sphinx>2.25.0
sphinx_rtd_theme
Jinja2
PyYAML
urllib3==1.26.15
urllib3>1.26.17