From 7d84ba2c5115a26b0152c936b9a6d09989180785 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Thu, 31 Aug 2023 14:07:31 -0400 Subject: [PATCH 1/2] Fix collection metadata license to match intent --- .../tools/roles/template_galaxy/templates/galaxy.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx_collection/tools/roles/template_galaxy/templates/galaxy.yml.j2 b/awx_collection/tools/roles/template_galaxy/templates/galaxy.yml.j2 index b9bb8e0ccc49..5290dc72174f 100644 --- a/awx_collection/tools/roles/template_galaxy/templates/galaxy.yml.j2 +++ b/awx_collection/tools/roles/template_galaxy/templates/galaxy.yml.j2 @@ -18,7 +18,7 @@ documentation: https://github.com/ansible/awx/blob/devel/awx_collection/README.m homepage: https://www.ansible.com/ issues: https://github.com/ansible/awx/issues?q=is%3Aissue+label%3Acomponent%3Aawx_collection license: - - GPL-3.0-only + - GPL-3.0-or-later name: {{ collection_package }} namespace: {{ collection_namespace }} readme: README.md From ab6bf964d2623940055780b83636d851a41892e2 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Tue, 5 Sep 2023 16:18:11 -0400 Subject: [PATCH 2/2] Declare license for unique module that uses BSD-2 Co-authored-by: Maxwell G --- .../tools/roles/template_galaxy/templates/galaxy.yml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awx_collection/tools/roles/template_galaxy/templates/galaxy.yml.j2 b/awx_collection/tools/roles/template_galaxy/templates/galaxy.yml.j2 index 5290dc72174f..bf306aeccac4 100644 --- a/awx_collection/tools/roles/template_galaxy/templates/galaxy.yml.j2 +++ b/awx_collection/tools/roles/template_galaxy/templates/galaxy.yml.j2 @@ -19,6 +19,8 @@ homepage: https://www.ansible.com/ issues: https://github.com/ansible/awx/issues?q=is%3Aissue+label%3Acomponent%3Aawx_collection license: - GPL-3.0-or-later + # plugins/module_utils/tower_legacy.py + - BSD-2-Clause name: {{ collection_package }} namespace: {{ collection_namespace }} readme: README.md