diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml deleted file mode 100644 index fb1b3563..00000000 --- a/.github/workflows/reuse.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -# Copyright (c) Ansible Project -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -name: Verify REUSE - -on: - push: - branches: - - main - - stable-* - pull_request: - branches: - - main - - stable-* - # Run CI once per day (at 09:00 UTC) - schedule: - - cron: '0 9 * * *' - -jobs: - check: - permissions: - contents: read - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - persist-credentials: false - - - name: Remove some files before checking REUSE compliance - run: | - rm -f tests/integration/targets/*/files/*.pem - rm -f tests/integration/targets/*/files/roots/*.pem - - - name: REUSE Compliance Check - uses: fsfe/reuse-action@v5 diff --git a/.gitignore b/.gitignore index 9d018f26..ae216b5b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # Community.crypt specific things /changelogs/.plugin-cache.yaml +/tests/integration/inventory/ # Created by https://www.gitignore.io/api/git,linux,pydev,python,windows,pycharm+all,jupyternotebook,vim,webstorm,emacs,dotenv diff --git a/README.md b/README.md index 84f3c433..09560c4b 100644 --- a/README.md +++ b/README.md @@ -169,4 +169,4 @@ See [LICENSES/GPL-3.0-or-later.txt](https://github.com/ansible-collections/commu Parts of the collection are licensed under the [Apache 2.0 license](https://github.com/ansible-collections/community.crypto/blob/main/LICENSES/Apache-2.0.txt) (`plugins/module_utils/crypto/_obj2txt.py` and `plugins/module_utils/crypto/_objects_data.py`), the [BSD 2-Clause license](https://github.com/ansible-collections/community.crypto/blob/main/LICENSES/BSD-2-Clause.txt) (`plugins/module_utils/ecs/api.py`), the [BSD 3-Clause license](https://github.com/ansible-collections/community.crypto/blob/main/LICENSES/BSD-3-Clause.txt) (`plugins/module_utils/crypto/_obj2txt.py`, `tests/integration/targets/prepare_jinja2_compat/filter_plugins/jinja_compatibility.py`), and the [PSF 2.0 license](https://github.com/ansible-collections/community.crypto/blob/main/LICENSES/PSF-2.0.txt) (`plugins/module_utils/_version.py`). This only applies to vendored files in ``plugins/module_utils/`` and to the ECS module utils. -Almost all files have a machine readable `SDPX-License-Identifier:` comment denoting its respective license(s) or an equivalent entry in an accompanying `.license` file. Only changelog fragments (which will not be part of a release) are covered by a blanket statement in `.reuse/dep5`. Right now a few vendored PEM files do not have licensing information as well. This conforms to the [REUSE specification](https://reuse.software/spec/) up to the aforementioned PEM files. +All files have a machine readable `SDPX-License-Identifier:` comment denoting its respective license(s) or an equivalent entry in an accompanying `.license` file. Only changelog fragments (which will not be part of a release) are covered by a blanket statement in `.reuse/dep5`. This conforms to the [REUSE specification](https://reuse.software/spec/). diff --git a/antsibull-nox.toml b/antsibull-nox.toml index a1ce95b7..ffffdd1a 100644 --- a/antsibull-nox.toml +++ b/antsibull-nox.toml @@ -11,14 +11,7 @@ validate_collection_refs="all" [sessions.license_check] -run_reuse = false -license_check_extra_ignore_paths = [ - "tests/integration/targets/*/files/*.pem", - "tests/integration/targets/*/files/roots/*.pem", -] -# Right now we need to run the following before 'reuse lint' passes: -# rm -f tests/integration/targets/*/files/*.pem -# rm -f tests/integration/targets/*/files/roots/*.pem +run_reuse = true [sessions.extra_checks] run_no_unwanted_files = true diff --git a/tests/integration/targets/certificate_complete_chain/files/cert1-chain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert1-chain.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert1-chain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert1-fullchain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert1-fullchain.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert1-fullchain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert1-root.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert1-root.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert1-root.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert1.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert1.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert1.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-altchain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-altchain.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-altchain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-altroot.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-altroot.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-altroot.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-chain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-chain.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-chain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-fullchain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-fullchain.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-fullchain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-root.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-root.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-root.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/CA_Bazbam.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/CA_Bazbam.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/CA_Bazbam.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/CA_Foobar.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/CA_Foobar.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/CA_Foobar.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/CA_Foobar_ECC.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/CA_Foobar_ECC.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/CA_Foobar_ECC.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/CA_Foobar_RSA.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/CA_Foobar_RSA.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/CA_Foobar_RSA.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/foobazbam.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/foobazbam.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/foobazbam.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/x509_certificate_info/files/cert1.pem.license b/tests/integration/targets/x509_certificate_info/files/cert1.pem.license new file mode 100644 index 00000000..edff8c76 --- /dev/null +++ b/tests/integration/targets/x509_certificate_info/files/cert1.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project