From 8348deb9dc619e8a0346b72430c138b54f307781 Mon Sep 17 00:00:00 2001 From: Stefan Hagspiel Date: Mon, 18 Nov 2024 10:26:17 +0100 Subject: [PATCH] final adjustments --- LICENSE.md | 54 +++++++++++++++++++++++---------------------------- composer.json | 5 ++++- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index e9e91878..037acbc9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,36 +1,30 @@ -# Contributor License Agreement +# License +Copyright (C) DACHCOM.DIGITAL -The following terms are used throughout this agreement: +This software is available under two different licenses: +* GNU General Public License version 3 (GPLv3) as Pimcore Community Edition +* DACHCOM Commercial License (DCL) -- **You** - the person or legal entity including its affiliates asked to accept this agreement. An affiliate is any entity -that controls or is controlled by the legal entity, or is under common control with it. -- **Project** - is an umbrella term that refers to any and all DACHCOM.DIGITAL AG open source projects. -- **Contribution** - any type of work that is submitted to a Project, including any modifications or additions to existing -work. -- **Submitted** - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or verbal -communication with DACHCOM.DIGITAL AG, contributors or maintainers. +The default Secure Storage license, without a valid DACHCOM Commercial License agreement, is the Open-Source GPLv3 license. -## 1. Grant of Copyright License. -Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and -to DACHCOM.DIGITAL AG 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 Your contributions and such -derivative works. Except for this license, You reserve all rights, title, and interest in your contributions. +## GNU General Public License version 3 (GPLv3) +If you decide to choose the GPLv3 license, you must comply with the following terms: -## 2. Grant of Patent License. -Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and -to DACHCOM.DIGITAL AG 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 your contributions, -where such license applies only to those patent claims licensable by you that are necessarily infringed by your -contribution or by combination of your contribution with the project to which this contribution was submitted. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -If any entity institutes patent litigation - including cross-claim or counterclaim in a lawsuit - against You alleging -that your contribution or any project it was submitted to constitutes or is responsible for direct or contributory -patent infringement, then any patent licenses granted to that entity under this agreement shall terminate as of the date -such litigation is filed. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. -## 3. Source of Contribution. -Your contribution is either your original creation, based upon previous work that, to the best of your knowledge, is -covered under an appropriate open source license, and you have the right under that license to submit that work with -modifications, whether created in whole or in part by you, or you have clearly identified the source of the contribution -and any license or other restriction (like related patents, trademarks, and license agreements) of which you are -personally aware. \ No newline at end of file +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +## DACHCOM Commercial License (DCL) +Alternatively, commercial and supported versions of the program - also known as +Commercial Distributions - must be used in accordance with the terms and conditions +contained in a separate written agreement between you and DACHCOM.DIGITAL AG. +For more information about the Secure Storage Commercial License (DCL) please contact dcdi@dachcom.ch. \ No newline at end of file diff --git a/composer.json b/composer.json index 1341deb7..1e11b9e5 100755 --- a/composer.json +++ b/composer.json @@ -1,7 +1,10 @@ { "name": "dachcom-digital/secure-storage", "type": "pimcore-bundle", - "license": "GPL-3.0-or-later", + "license": [ + "GPL-3.0-or-later", + "DCL" + ], "description": "Pimcore Security Storage Bundle", "keywords": ["pimcore", "security", "flystem", "encryption"], "homepage": "https://github.com/dachcom-digital/pimcore-secure-storage",