From 70ded6f6a29569c27bfa5a3641a47c921416c065 Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Thu, 21 Sep 2023 00:19:50 +0200 Subject: [PATCH] Updating the license from Apache 2.0 to Business Source License 1.1 --- .copywrite.hcl | 17 ++ .github/workflows/cla.yaml | 12 + Gemfile | 3 + LICENSE | 214 +++--------------- Makefile | 11 +- attributes/default.rb | 3 + examples/run/Policyfile.rb | 3 + examples/run/metadata.rb | 3 + examples/run/recipes/default.rb | 3 + kitchen.dokken.yml | 3 + kitchen.yml | 3 + metadata.rb | 7 +- spec/recipes/default_spec.rb | 3 + spec/spec_helper.rb | 3 + test/cookbooks/mondoo-test/metadata.rb | 3 + test/cookbooks/mondoo-test/recipes/default.rb | 3 + test/integration/default/default_test.rb | 3 + 17 files changed, 107 insertions(+), 190 deletions(-) create mode 100644 .copywrite.hcl diff --git a/.copywrite.hcl b/.copywrite.hcl new file mode 100644 index 0000000..ed2142c --- /dev/null +++ b/.copywrite.hcl @@ -0,0 +1,17 @@ +schema_version = 1 + +project { + license = "BUSL-1.1" + copyright_holder = "Mondoo, Inc." + copyright_year = 2023 + + # (OPTIONAL) A list of globs that should not have copyright/license headers. + # Supports doublestar glob patterns for more flexibility in defining which + # files or folders should be ignored + header_ignore = [ + "**/*.tf", + "**/testdata/**", + "**/*.pb.go", + "**/*_string.go", + ] +} \ No newline at end of file diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml index 4092ad4..eaea8f1 100644 --- a/.github/workflows/cla.yaml +++ b/.github/workflows/cla.yaml @@ -24,3 +24,15 @@ jobs: remote-organization-name: mondoohq branch: 'main' allowlist: mondoo-tools,github-actions[bot],dependabot[bot] + + license-check: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup Copywrite + uses: hashicorp/setup-copywrite@v1.1.2 + + - name: Check Header Compliance + run: copywrite headers --plan diff --git a/Gemfile b/Gemfile index cfaba74..a82eb03 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + source 'https://rubygems.org' group :tools do diff --git a/LICENSE b/LICENSE index 8dada3e..f5dc69a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,41 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved. +“Business Source License” is a trademark of MariaDB Corporation Ab. - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +Parameters - 1. Definitions. +Licensor: Mondoo, Inc. (“Mondoo”) +Licensed Work(s): chef cookbook version 1.1.0 and + later. The Licensed Work is (c) 2023 Mondoo, Inc. +Additional Use Grant: You may use, distribute or host the Licensed Work in + your own or your direct customers’ production + environment, provided that such use, distribution or + hosting does not include offering the Licensed Work to + third parties as part of or in connection with an + offering that is competitive with any of Mondoo’s + products. +Change Date: Four years from the date the Licensed Work is published +Change License: MPL 2.0 - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. +For information about alternative licensing arrangements for the Licensed Work, please contact licensing@mondoo.com. - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. +Notice - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. +Business Source License 1.1 - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. +Terms - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. +The Licensor hereby grants you the right to copy, modify, create derivative works, redistribute, and make non-production use of the Licensed Work. The Licensor may make an Additional Use Grant, above, permitting limited production use. - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. +Effective on the Change Date, or the fourth anniversary of the first publicly available distribution of a specific version of the Licensed Work under this License, whichever comes first, the Licensor hereby grants you rights under the terms of the Change License, and the rights granted in the paragraph above terminate. - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). +If your use of the Licensed Work does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its affiliated entities, or authorized resellers, or you must refrain from using the Licensed Work. - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. +All copies of the original and modified Licensed Work, and derivative works of the Licensed Work, are subject to this License. This License applies separately for each version of the Licensed Work and the Change Date may vary for each version of the Licensed Work released by Licensor. - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." +You must conspicuously display this License on each original or modified copy of the Licensed Work. If you receive the Licensed Work in original or modified form from a third party, the terms and conditions set forth in this License apply to your use of that work. - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. +Any use of the Licensed Work in violation of this License will automatically terminate your rights under this License for the current and all other versions of the Licensed Work. - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. +This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License). - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE. diff --git a/Makefile b/Makefile index d81c890..df4d19d 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,12 @@ .PHONY: test/spell-check test/spell-check: - act -j spelling --container-architecture linux/amd64 \ No newline at end of file + act -j spelling --container-architecture linux/amd64 + +# Copywrite Check Tool: https://github.com/hashicorp/copywrite +license: license/headers/check + +license/headers/check: + copywrite headers --plan + +license/headers/apply: + copywrite headers diff --git a/attributes/default.rb b/attributes/default.rb index b31975f..9021202 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + default['mondoo']['registration_token'] = 'change_me' default['mondoo']['api_proxy'] = nil diff --git a/examples/run/Policyfile.rb b/examples/run/Policyfile.rb index 4abdb31..a93c9b4 100644 --- a/examples/run/Policyfile.rb +++ b/examples/run/Policyfile.rb @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + name 'run' run_list 'run::default' diff --git a/examples/run/metadata.rb b/examples/run/metadata.rb index 6f0aaa9..16a19fe 100644 --- a/examples/run/metadata.rb +++ b/examples/run/metadata.rb @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + name 'run' depends 'mondoo' version '1.0.0' diff --git a/examples/run/recipes/default.rb b/examples/run/recipes/default.rb index ab50cb9..444a946 100644 --- a/examples/run/recipes/default.rb +++ b/examples/run/recipes/default.rb @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + # This is really mitigating a bug in Chef. The `package` resource fails on a # fresh amazonlinux instance because Chef is not using Utf-8 properly # This ensures all exec's by Chef use utf8 as locale diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml index 9ad2051..9e28ec7 100644 --- a/kitchen.dokken.yml +++ b/kitchen.dokken.yml @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + --- driver: name: dokken diff --git a/kitchen.yml b/kitchen.yml index 0d90afc..a7bbbb4 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + --- driver: name: vagrant diff --git a/metadata.rb b/metadata.rb index d9cf364..4345ba1 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,9 +1,12 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + name 'mondoo' maintainer 'Mondoo, Inc' maintainer_email 'hello@mondoo.com' -license 'Apache-2.0' +license 'BUSL-1.1' description 'Installs and configures Mondoo package for infrastructure security, compliance, and asset intelligence' -version '1.0.0' +version '1.1.0' chef_version '>= 14' source_url 'https://github.com/mondoohq/chef-mondoo' issues_url 'https://github.com/mondoohq/chef-mondoo/issues' diff --git a/spec/recipes/default_spec.rb b/spec/recipes/default_spec.rb index fe8a974..43e96a8 100644 --- a/spec/recipes/default_spec.rb +++ b/spec/recipes/default_spec.rb @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + require 'spec_helper' describe 'mondoo::default' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cfaeb23..d4e6c73 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + require 'chefspec' require 'chefspec/berkshelf' diff --git a/test/cookbooks/mondoo-test/metadata.rb b/test/cookbooks/mondoo-test/metadata.rb index 4cf8012..6e8bf74 100644 --- a/test/cookbooks/mondoo-test/metadata.rb +++ b/test/cookbooks/mondoo-test/metadata.rb @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + name 'mondoo-test' version '0.1.0' diff --git a/test/cookbooks/mondoo-test/recipes/default.rb b/test/cookbooks/mondoo-test/recipes/default.rb index a9debfe..e0f1a3e 100644 --- a/test/cookbooks/mondoo-test/recipes/default.rb +++ b/test/cookbooks/mondoo-test/recipes/default.rb @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + # see https://docs.chef.io/environment_variables.html ENV['LANG'] = 'en_US.utf-8' ENV['LC_ALL'] = 'en_US.utf-8' diff --git a/test/integration/default/default_test.rb b/test/integration/default/default_test.rb index 225124c..092cb16 100644 --- a/test/integration/default/default_test.rb +++ b/test/integration/default/default_test.rb @@ -1,3 +1,6 @@ +# Copyright (c) Mondoo, Inc. +# SPDX-License-Identifier: BUSL-1.1 + # InSpec test for recipe mondoo::default describe package('mondoo') do