From acab276d5199194b06f97d362b41dd6858d70e83 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 14 Jan 2021 15:54:51 +0100 Subject: [PATCH] Relicense plugins/module_utils/acme.py under GPLv3+. (#165) The code was originally licensed under GPLv3+ when being part of the letsencrypt module. It was relicensed under BSD 2-clause when moving to Ansible's module_utils (https://github.com/ansible/ansible/pull/40697). The code was only touched by two persons (https://github.com/ansible/ansible/commits/pre-ansible-base/lib/ansible/module_utils/acme.py, https://github.com/ansible-collections/community.crypto/commits/main/plugins/module_utils/acme.py) and both persons consented in this PR (https://github.com/ansible-collections/community.crypto/pull/165) before it was merged. --- changelogs/fragments/acme-module-utils-relicense.yml | 2 ++ plugins/module_utils/acme.py | 11 ++--------- 2 files changed, 4 insertions(+), 9 deletions(-) create mode 100644 changelogs/fragments/acme-module-utils-relicense.yml diff --git a/changelogs/fragments/acme-module-utils-relicense.yml b/changelogs/fragments/acme-module-utils-relicense.yml new file mode 100644 index 00000000..297bb4c3 --- /dev/null +++ b/changelogs/fragments/acme-module-utils-relicense.yml @@ -0,0 +1,2 @@ +minor_changes: +- "The ACME module_utils has been relicensed back from the Simplified BSD License (https://opensource.org/licenses/BSD-2-Clause) to the GPLv3+ (same license used by most other code in this collection). This undoes a licensing change when the original GPLv3+ licensed code was moved to module_utils in https://github.com/ansible/ansible/pull/40697 (https://github.com/ansible-collections/community.crypto/pull/165)." diff --git a/plugins/module_utils/acme.py b/plugins/module_utils/acme.py index 4b782e2a..1026caa3 100644 --- a/plugins/module_utils/acme.py +++ b/plugins/module_utils/acme.py @@ -1,14 +1,7 @@ # -*- coding: utf-8 -*- -# This code is part of Ansible, but is an independent component. -# This particular file snippet, and this file snippet only, is BSD licensed. -# Modules you write using this snippet, which is embedded dynamically by Ansible -# still belong to the author of the module, and may assign their own license -# to the complete work. -# -# Copyright (c), Michael Gruener , 2016 -# -# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause) +# (c) 2016 Michael Gruener +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import absolute_import, division, print_function __metaclass__ = type