From dd2a841735757b0933a5c7c2d9ca35eb416900e5 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 9 Oct 2024 12:28:34 -0600 Subject: [PATCH 01/10] chore: update the license to AGPLv3 --- CODEOWNERS | 2 +- LICENSE | 201 ------ LICENSE.md | 661 ++++++++++++++++++ LICENSING.md | 18 + .../0002-apache-2.0-for-all-uds-products.md | 2 +- .../adrs/0004-agpl-v3-for-all-uds-products.md | 51 ++ tasks/lint.yaml | 14 + 7 files changed, 746 insertions(+), 203 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.md create mode 100644 LICENSING.md create mode 100644 docs/adrs/0004-agpl-v3-for-all-uds-products.md diff --git a/CODEOWNERS b/CODEOWNERS index 3870609a..c954f36a 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -9,4 +9,4 @@ # Additional privileged files /CODEOWNERS @jeff-mccoy @daveworth -/LICENSE @jeff-mccoy @daveworth +/LICENSE* @jeff-mccoy @daveworth diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 8dd2f887..00000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "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. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "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. - - "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). - - "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. - - "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." - - "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. - - 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. - - 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 2024 Defense Unicorns - - 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. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..0ad25db4 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/LICENSING.md b/LICENSING.md new file mode 100644 index 00000000..e4942dde --- /dev/null +++ b/LICENSING.md @@ -0,0 +1,18 @@ +# Dual Licensing + +This software is licensed under either of: + +- GNU Affero General Public License v3.0 (AGPLv3), see [LICENSE.md](./LICENSE.md) +- Defense Unicorns Commercial License, see below + +## Defense Unicorns Commercial License + +The use of this software under a commercial license is subject to the terms +of the license agreement between the licensee and Defense Unicorns. The +content of this license depends on the specific agreement and may vary. For +more information about obtaining a commercial license, please contact +Defense Unicorns at [defenseunicorns.com](https://defenseunicorns.com). + +To use this software under the commercial license, you must have a valid +license agreement with Defense Unicorns. The terms of that license agreement +replace the terms of the AGPL v3 license. diff --git a/docs/adrs/0002-apache-2.0-for-all-uds-products.md b/docs/adrs/0002-apache-2.0-for-all-uds-products.md index e9e061bd..47c31a5d 100644 --- a/docs/adrs/0002-apache-2.0-for-all-uds-products.md +++ b/docs/adrs/0002-apache-2.0-for-all-uds-products.md @@ -4,7 +4,7 @@ Date: 2024-06-28 ## Status -Accepted +Superseded (by [0004-agpl-v3-for-all-uds-products.md](./0004-agpl-v3-for-all-uds-products.md)) ## Context diff --git a/docs/adrs/0004-agpl-v3-for-all-uds-products.md b/docs/adrs/0004-agpl-v3-for-all-uds-products.md new file mode 100644 index 00000000..72baee66 --- /dev/null +++ b/docs/adrs/0004-agpl-v3-for-all-uds-products.md @@ -0,0 +1,51 @@ +# 4. [Affero General Public License v3 (AGPLv3)](https://opensource.org/license/agpl-v3) for All UDS Products + +Date: 2024-10-08 + +## Status + +Accepted + +## Context + +We have been using Apache 2.0 for our UDS products to ensure wide adoption and foster +collaboration within the open-source community. However, as our UDS product set has +grown in recent months, we’ve reconsidered our licensing strategy and how adopting a +stronger copy-left license could further promote a more open and collaborative ecosystem. + +Our commitment to Free and Open-Source Software (FOSS) remains strong. We believe in +cultivating an environment where contributions from all parties, including competitors, +are both encouraged and valued. Large contractors in our space, such as the DoD Primes +(akin to the hyper-scalers in the cloud industry), have significant resources and +established relationships that we want to continue to engage. To reinforce the reciprocal +nature of FOSS in this environment though, we are transitioning to the [Affero General +Public License (v3)](https://opensource.org/license/agpl-v3). + +This license not only ensures that others using our technology contribute back to the +community, but it also aligns with our goals of delivering innovative FOSS solutions, +attracting top-tier talent, and accelerating delivery with an agile, open-source-first +approach. We believe AGPLv3 reflects the spirit of our mission and encourages responsible, +transparent collaboration - strengthening the open-source community we all rely on. + +We also understand though that some partners may require a more traditional commercial +license. To address this need, we will also be offering a dual-licensing model. This +approach ensures that we continue to serve our partners without slowing down their +adoption or deployment of our solutions, while still encouraging a strong, +open-source-first approach. + +## Decision + +We have decided to adopt the [Affero General Public License (v3)](https://opensource.org/license/agpl-v3) for all UDS products, +with the option for a commercial license for partners who require it. + +## Consequences + +Going forward we will need to educate and collaborate with our partners and the larger +DoD ecosystem to help them understand the new licenses and this shift. These core +products are still as free and open source as ever but with a few more checks to ensure +things can stay that way for the long term. As with the last ADR we still acknowledge +that others could take our products and resell them, but now they would need to do that +openly which is not only better for us, but also better for our partners as well. + +Also of note - this change only applies to Unicorn Delivery Service (UDS) branded +products. Our other products (Pepr, Lula, etc) will remain Apache 2.0. diff --git a/tasks/lint.yaml b/tasks/lint.yaml index 5628d447..fd1529e4 100644 --- a/tasks/lint.yaml +++ b/tasks/lint.yaml @@ -8,6 +8,9 @@ tasks: actions: - description: Install yamllint via pip cmd: CMD=pip && which $CMD || CMD=pip3 && $CMD install yamllint>=1.30.0 + - description: Install addlicense via go + # renovate: datasource=github-tags depName=google/addlicense versioning=semver + cmd: GOPATH="$HOME/go" go install github.com/google/addlicense@v1.1.1 - name: all description: Run all linting commands @@ -15,6 +18,7 @@ tasks: - task: yaml - task: oscal - task: shell + - task: license - name: yaml description: Run YAML linting checks @@ -128,3 +132,13 @@ tasks: lint_scripts "$yaml_file" "$raw_scripts" fi done + + - name: license + description: Lint for the SPDX license identifier being in source files + actions: + - cmd: "\"$HOME/go/bin/addlicense\" -l 'AGPL-3.0-or-later OR Commercial' -check -s=only -v -c 'Defense Unicorns' ." + + - name: fix-license + description: Add the SPDX license identifier to source files + actions: + - cmd: "\"$HOME/go/bin/addlicense\" -l 'AGPL-3.0-or-later OR Commercial' -s=only -v -c 'Defense Unicorns' ." From a79d7a442b32add562413c5d0b5160639bbf9de0 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 9 Oct 2024 13:09:45 -0600 Subject: [PATCH 02/10] fix the spdx identifiers --- .github/actions/test-flavor/action.yaml | 3 +++ .github/workflows/callable-ci-docs-shim.yaml | 3 +++ .github/workflows/callable-commitlint.yaml | 3 +++ .github/workflows/callable-lint.yaml | 3 +++ .github/workflows/callable-publish.yaml | 3 +++ .github/workflows/callable-scorecard.yaml | 3 +++ .github/workflows/callable-test.yaml | 3 +++ .github/workflows/ci-docs-shim.yaml | 3 +++ .github/workflows/release.yaml | 3 +++ .github/workflows/test.yaml | 3 +++ bundle/uds-bundle.yaml | 3 +++ bundle/uds-config.yaml | 3 +++ chart/Chart.yaml | 3 +++ chart/templates/uds-package.yaml | 3 +++ chart/values.yaml | 3 +++ common/zarf.yaml | 3 +++ oscal-component.yaml | 3 +++ src/nginx/Chart.yaml | 3 +++ src/nginx/templates/configmap.yaml | 3 +++ src/nginx/templates/deployment.yaml | 3 +++ src/nginx/templates/hpa.yaml | 3 +++ src/nginx/templates/ingress.yaml | 3 +++ src/nginx/templates/service-metrics.yaml | 3 +++ src/nginx/templates/service.yaml | 3 +++ src/nginx/templates/serviceaccount.yaml | 3 +++ src/nginx/templates/tests/test-connection.yaml | 3 +++ src/nginx/values.yaml | 3 +++ tasks.yaml | 3 +++ tasks/actions.yaml | 3 +++ tasks/badge.yaml | 3 +++ tasks/compliance.yaml | 3 +++ tasks/create.yaml | 3 +++ tasks/deploy.yaml | 3 +++ tasks/lint.yaml | 3 +++ tasks/publish.yaml | 3 +++ tasks/pull.yaml | 3 +++ tasks/remove.yaml | 3 +++ tasks/setup.yaml | 3 +++ tasks/upgrade.yaml | 3 +++ tasks/utils.yaml | 3 +++ values/common-values.yaml | 3 +++ values/registry1-values.yaml | 3 +++ values/unicorn-values.yaml | 3 +++ values/upstream-values.yaml | 3 +++ zarf.yaml | 3 +++ 45 files changed, 135 insertions(+) diff --git a/.github/actions/test-flavor/action.yaml b/.github/actions/test-flavor/action.yaml index d4a63ffa..9037d679 100644 --- a/.github/actions/test-flavor/action.yaml +++ b/.github/actions/test-flavor/action.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: Test-Flavor description: Check the flavor for the UDS package diff --git a/.github/workflows/callable-ci-docs-shim.yaml b/.github/workflows/callable-ci-docs-shim.yaml index 91144a42..868bedd3 100644 --- a/.github/workflows/callable-ci-docs-shim.yaml +++ b/.github/workflows/callable-ci-docs-shim.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: CI Docs Shim on: diff --git a/.github/workflows/callable-commitlint.yaml b/.github/workflows/callable-commitlint.yaml index 44e660ba..d582fcd8 100644 --- a/.github/workflows/callable-commitlint.yaml +++ b/.github/workflows/callable-commitlint.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: PR Title Check on: diff --git a/.github/workflows/callable-lint.yaml b/.github/workflows/callable-lint.yaml index fd7238b8..9a9a4e6a 100644 --- a/.github/workflows/callable-lint.yaml +++ b/.github/workflows/callable-lint.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: Lint on: diff --git a/.github/workflows/callable-publish.yaml b/.github/workflows/callable-publish.yaml index 9e75f44b..4e8abd97 100644 --- a/.github/workflows/callable-publish.yaml +++ b/.github/workflows/callable-publish.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: Callable-Publish on: diff --git a/.github/workflows/callable-scorecard.yaml b/.github/workflows/callable-scorecard.yaml index d93dded6..a9c5cdab 100644 --- a/.github/workflows/callable-scorecard.yaml +++ b/.github/workflows/callable-scorecard.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: Scorecards supply-chain security on: # Only the default branch is supported. diff --git a/.github/workflows/callable-test.yaml b/.github/workflows/callable-test.yaml index d4649fda..2a2d4888 100644 --- a/.github/workflows/callable-test.yaml +++ b/.github/workflows/callable-test.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: Callable-Test on: diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index 6ed96cae..04a1bdad 100644 --- a/.github/workflows/ci-docs-shim.yaml +++ b/.github/workflows/ci-docs-shim.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: CI Doc Shim on: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b2ad65d0..4b9fc9ab 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: Release on: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d3c2b981..7092f905 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + name: Test on: diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index b44a68ce..32893041 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + kind: UDSBundle metadata: name: test diff --git a/bundle/uds-config.yaml b/bundle/uds-config.yaml index e6078069..e5825022 100644 --- a/bundle/uds-config.yaml +++ b/bundle/uds-config.yaml @@ -1,2 +1,5 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + options: log_level: debug diff --git a/chart/Chart.yaml b/chart/Chart.yaml index c359041f..4c16e2fc 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + apiVersion: v2 name: chart description: uds-nginx-config diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml index d0307dbd..b2d01d5a 100644 --- a/chart/templates/uds-package.yaml +++ b/chart/templates/uds-package.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + apiVersion: uds.dev/v1alpha1 kind: Package metadata: diff --git a/chart/values.yaml b/chart/values.yaml index 58547130..4ae0a75f 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + domain: "###ZARF_VAR_DOMAIN###" # custom: diff --git a/common/zarf.yaml b/common/zarf.yaml index 5e16234b..60103283 100644 --- a/common/zarf.yaml +++ b/common/zarf.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + # yaml-language-server: $schema=https://raw.githubusercontent.com/zarf-dev/zarf/main/zarf.schema.json kind: ZarfPackageConfig metadata: diff --git a/oscal-component.yaml b/oscal-component.yaml index f0314229..c8abd0e0 100644 --- a/oscal-component.yaml +++ b/oscal-component.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + # add the descriptions inline component-definition: uuid: fae03d9e-4cfc-47ca-b0e9-05dae10c557b diff --git a/src/nginx/Chart.yaml b/src/nginx/Chart.yaml index 49f9b435..be726553 100644 --- a/src/nginx/Chart.yaml +++ b/src/nginx/Chart.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + apiVersion: v2 name: nginx description: A Helm chart for Kubernetes diff --git a/src/nginx/templates/configmap.yaml b/src/nginx/templates/configmap.yaml index db192cab..6d864989 100644 --- a/src/nginx/templates/configmap.yaml +++ b/src/nginx/templates/configmap.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + apiVersion: v1 kind: ConfigMap metadata: diff --git a/src/nginx/templates/deployment.yaml b/src/nginx/templates/deployment.yaml index 0e83be1d..f4d0ba4b 100644 --- a/src/nginx/templates/deployment.yaml +++ b/src/nginx/templates/deployment.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/src/nginx/templates/hpa.yaml b/src/nginx/templates/hpa.yaml index b664f71a..d0c80378 100644 --- a/src/nginx/templates/hpa.yaml +++ b/src/nginx/templates/hpa.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + {{- if .Values.autoscaling.enabled }} apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler diff --git a/src/nginx/templates/ingress.yaml b/src/nginx/templates/ingress.yaml index fc6576a2..1e1b9ccd 100644 --- a/src/nginx/templates/ingress.yaml +++ b/src/nginx/templates/ingress.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + {{- if .Values.ingress.enabled -}} {{- $fullName := include "nginx.fullname" . -}} {{- $svcPort := .Values.service.port -}} diff --git a/src/nginx/templates/service-metrics.yaml b/src/nginx/templates/service-metrics.yaml index e3933890..1f015797 100644 --- a/src/nginx/templates/service-metrics.yaml +++ b/src/nginx/templates/service-metrics.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + apiVersion: v1 kind: Service metadata: diff --git a/src/nginx/templates/service.yaml b/src/nginx/templates/service.yaml index 7183073d..611020c3 100644 --- a/src/nginx/templates/service.yaml +++ b/src/nginx/templates/service.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + apiVersion: v1 kind: Service metadata: diff --git a/src/nginx/templates/serviceaccount.yaml b/src/nginx/templates/serviceaccount.yaml index 02c08bb0..11ea6b23 100644 --- a/src/nginx/templates/serviceaccount.yaml +++ b/src/nginx/templates/serviceaccount.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + {{- if .Values.serviceAccount.create -}} apiVersion: v1 kind: ServiceAccount diff --git a/src/nginx/templates/tests/test-connection.yaml b/src/nginx/templates/tests/test-connection.yaml index 5879b4f6..e4846625 100644 --- a/src/nginx/templates/tests/test-connection.yaml +++ b/src/nginx/templates/tests/test-connection.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + apiVersion: v1 kind: Pod metadata: diff --git a/src/nginx/values.yaml b/src/nginx/values.yaml index 771b3129..bba7847d 100644 --- a/src/nginx/values.yaml +++ b/src/nginx/values.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + # Default values for nginx. # This is a YAML-formatted file. # Declare variables to be passed into your templates. diff --git a/tasks.yaml b/tasks.yaml index 436152cf..259d95f8 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + includes: - setup: ./tasks/setup.yaml - create: ./tasks/create.yaml diff --git a/tasks/actions.yaml b/tasks/actions.yaml index 24e705c2..259c0260 100644 --- a/tasks/actions.yaml +++ b/tasks/actions.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + variables: - name: REGISTRY1_USERNAME default: "" diff --git a/tasks/badge.yaml b/tasks/badge.yaml index 24beb241..90687c27 100644 --- a/tasks/badge.yaml +++ b/tasks/badge.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + # yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/uds-cli/main/tasks.schema.json variables: diff --git a/tasks/compliance.yaml b/tasks/compliance.yaml index b93417e0..c9aeabee 100644 --- a/tasks/compliance.yaml +++ b/tasks/compliance.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + tasks: - name: validate description: Lula Validate OSCAL Compliance diff --git a/tasks/create.yaml b/tasks/create.yaml index 94828e3a..e28dc85c 100644 --- a/tasks/create.yaml +++ b/tasks/create.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + variables: - name: FLAVOR default: upstream diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index dd7bc089..2ee4d5e9 100644 --- a/tasks/deploy.yaml +++ b/tasks/deploy.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + tasks: - name: package description: Deploy the created UDS Zarf Package diff --git a/tasks/lint.yaml b/tasks/lint.yaml index fd1529e4..1d8d2351 100644 --- a/tasks/lint.yaml +++ b/tasks/lint.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + variables: - name: OSCALFILES default: ./oscal-component.yaml diff --git a/tasks/publish.yaml b/tasks/publish.yaml index e3dd4796..9fb350be 100644 --- a/tasks/publish.yaml +++ b/tasks/publish.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + includes: - utils: ./utils.yaml diff --git a/tasks/pull.yaml b/tasks/pull.yaml index d2791f42..3722c63b 100644 --- a/tasks/pull.yaml +++ b/tasks/pull.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + includes: - utils: https://raw.githubusercontent.com/defenseunicorns/uds-common/7d5f445a50b19e97b9a8bed0d2445654ae05bab6/tasks/utils.yaml diff --git a/tasks/remove.yaml b/tasks/remove.yaml index e2de7049..080cfdf4 100644 --- a/tasks/remove.yaml +++ b/tasks/remove.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + tasks: - name: test-bundle description: Remove the deployed test bundle diff --git a/tasks/setup.yaml b/tasks/setup.yaml index 664c4b21..c78ec902 100644 --- a/tasks/setup.yaml +++ b/tasks/setup.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + variables: - name: KEYCLOAK_GROUP diff --git a/tasks/upgrade.yaml b/tasks/upgrade.yaml index beac6da1..eeae1e42 100644 --- a/tasks/upgrade.yaml +++ b/tasks/upgrade.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + includes: - utils: https://raw.githubusercontent.com/defenseunicorns/uds-common/7d5f445a50b19e97b9a8bed0d2445654ae05bab6/tasks/utils.yaml diff --git a/tasks/utils.yaml b/tasks/utils.yaml index 7dbdf826..85d9066b 100644 --- a/tasks/utils.yaml +++ b/tasks/utils.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + variables: - name: FLAVOR default: upstream diff --git a/values/common-values.yaml b/values/common-values.yaml index ebecead6..fa7df752 100644 --- a/values/common-values.yaml +++ b/values/common-values.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + securityContext: capabilities: drop: diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml index b08481d8..8429f7c1 100644 --- a/values/registry1-values.yaml +++ b/values/registry1-values.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + image: repository: registry1.dso.mil/ironbank/opensource/nginx/nginx tag: 1.26.1 diff --git a/values/unicorn-values.yaml b/values/unicorn-values.yaml index a96a3d84..0fcdba6e 100644 --- a/values/unicorn-values.yaml +++ b/values/unicorn-values.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + image: repository: cgr.dev/du-uds-defenseunicorns/nginx tag: 1.26.1 diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml index ab1227b7..db65a93d 100644 --- a/values/upstream-values.yaml +++ b/values/upstream-values.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + image: repository: nginx tag: 1.26.1 diff --git a/zarf.yaml b/zarf.yaml index 6407ff58..7d61d56b 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -1,3 +1,6 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial + # yaml-language-server: $schema=https://raw.githubusercontent.com/zarf-dev/zarf/main/zarf.schema.json kind: ZarfPackageConfig metadata: From 0242e200f1f582f3a3c7023bd17a4f95937f6d3c Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 9 Oct 2024 13:10:57 -0600 Subject: [PATCH 03/10] add + commercial to title for clarity --- docs/adrs/0004-agpl-v3-for-all-uds-products.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adrs/0004-agpl-v3-for-all-uds-products.md b/docs/adrs/0004-agpl-v3-for-all-uds-products.md index 72baee66..053f65e4 100644 --- a/docs/adrs/0004-agpl-v3-for-all-uds-products.md +++ b/docs/adrs/0004-agpl-v3-for-all-uds-products.md @@ -1,4 +1,4 @@ -# 4. [Affero General Public License v3 (AGPLv3)](https://opensource.org/license/agpl-v3) for All UDS Products +# 4. [Affero General Public License v3 (AGPLv3)](https://opensource.org/license/agpl-v3) + Commercial for All UDS Products Date: 2024-10-08 From e040defd897e618e1fbd922c15a11e976cf4fecc Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 9 Oct 2024 13:13:09 -0600 Subject: [PATCH 04/10] change + to or --- docs/adrs/0004-agpl-v3-for-all-uds-products.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adrs/0004-agpl-v3-for-all-uds-products.md b/docs/adrs/0004-agpl-v3-for-all-uds-products.md index 053f65e4..74ede191 100644 --- a/docs/adrs/0004-agpl-v3-for-all-uds-products.md +++ b/docs/adrs/0004-agpl-v3-for-all-uds-products.md @@ -1,4 +1,4 @@ -# 4. [Affero General Public License v3 (AGPLv3)](https://opensource.org/license/agpl-v3) + Commercial for All UDS Products +# 4. [Affero General Public License v3 (AGPLv3)](https://opensource.org/license/agpl-v3) or Commercial for All UDS Products Date: 2024-10-08 From 3e7ccc20e1a6c657a3ed0ab897422d8e0aa4478e Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 9 Oct 2024 13:28:32 -0600 Subject: [PATCH 05/10] fix helm template --- src/nginx/templates/serviceaccount.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nginx/templates/serviceaccount.yaml b/src/nginx/templates/serviceaccount.yaml index 11ea6b23..bae8ff70 100644 --- a/src/nginx/templates/serviceaccount.yaml +++ b/src/nginx/templates/serviceaccount.yaml @@ -1,7 +1,7 @@ # Copyright 2024 Defense Unicorns # SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial -{{- if .Values.serviceAccount.create -}} +{{- if .Values.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount metadata: From 2726e86878d940c702fe776f49a9a8ebbd5e6ce3 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 9 Oct 2024 14:00:04 -0600 Subject: [PATCH 06/10] use LicenseRef to denote user-defined license --- .github/actions/test-flavor/action.yaml | 2 +- .github/workflows/callable-ci-docs-shim.yaml | 2 +- .github/workflows/callable-commitlint.yaml | 2 +- .github/workflows/callable-lint.yaml | 2 +- .github/workflows/callable-publish.yaml | 2 +- .github/workflows/callable-scorecard.yaml | 2 +- .github/workflows/callable-test.yaml | 2 +- .github/workflows/ci-docs-shim.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/test.yaml | 2 +- bundle/uds-bundle.yaml | 2 +- bundle/uds-config.yaml | 2 +- chart/Chart.yaml | 2 +- chart/templates/uds-package.yaml | 2 +- chart/values.yaml | 2 +- common/zarf.yaml | 2 +- oscal-component.yaml | 2 +- src/nginx/Chart.yaml | 2 +- src/nginx/templates/configmap.yaml | 2 +- src/nginx/templates/deployment.yaml | 2 +- src/nginx/templates/hpa.yaml | 2 +- src/nginx/templates/ingress.yaml | 2 +- src/nginx/templates/service-metrics.yaml | 2 +- src/nginx/templates/service.yaml | 2 +- src/nginx/templates/serviceaccount.yaml | 2 +- src/nginx/templates/tests/test-connection.yaml | 2 +- src/nginx/values.yaml | 2 +- tasks.yaml | 2 +- tasks/actions.yaml | 2 +- tasks/badge.yaml | 2 +- tasks/compliance.yaml | 2 +- tasks/create.yaml | 2 +- tasks/deploy.yaml | 2 +- tasks/lint.yaml | 6 +++--- tasks/publish.yaml | 2 +- tasks/pull.yaml | 2 +- tasks/remove.yaml | 2 +- tasks/setup.yaml | 2 +- tasks/upgrade.yaml | 2 +- tasks/utils.yaml | 2 +- values/common-values.yaml | 2 +- values/registry1-values.yaml | 2 +- values/unicorn-values.yaml | 2 +- values/upstream-values.yaml | 2 +- zarf.yaml | 2 +- 45 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/actions/test-flavor/action.yaml b/.github/actions/test-flavor/action.yaml index 9037d679..b259ad33 100644 --- a/.github/actions/test-flavor/action.yaml +++ b/.github/actions/test-flavor/action.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: Test-Flavor description: Check the flavor for the UDS package diff --git a/.github/workflows/callable-ci-docs-shim.yaml b/.github/workflows/callable-ci-docs-shim.yaml index 868bedd3..04c82795 100644 --- a/.github/workflows/callable-ci-docs-shim.yaml +++ b/.github/workflows/callable-ci-docs-shim.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: CI Docs Shim diff --git a/.github/workflows/callable-commitlint.yaml b/.github/workflows/callable-commitlint.yaml index d582fcd8..a1fef126 100644 --- a/.github/workflows/callable-commitlint.yaml +++ b/.github/workflows/callable-commitlint.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: PR Title Check diff --git a/.github/workflows/callable-lint.yaml b/.github/workflows/callable-lint.yaml index 9a9a4e6a..89ae6742 100644 --- a/.github/workflows/callable-lint.yaml +++ b/.github/workflows/callable-lint.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: Lint diff --git a/.github/workflows/callable-publish.yaml b/.github/workflows/callable-publish.yaml index 4e8abd97..57e3bb62 100644 --- a/.github/workflows/callable-publish.yaml +++ b/.github/workflows/callable-publish.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: Callable-Publish diff --git a/.github/workflows/callable-scorecard.yaml b/.github/workflows/callable-scorecard.yaml index a9c5cdab..e69bdff4 100644 --- a/.github/workflows/callable-scorecard.yaml +++ b/.github/workflows/callable-scorecard.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: Scorecards supply-chain security on: diff --git a/.github/workflows/callable-test.yaml b/.github/workflows/callable-test.yaml index 2a2d4888..d2038686 100644 --- a/.github/workflows/callable-test.yaml +++ b/.github/workflows/callable-test.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: Callable-Test diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index 04a1bdad..fa97b9d0 100644 --- a/.github/workflows/ci-docs-shim.yaml +++ b/.github/workflows/ci-docs-shim.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: CI Doc Shim diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4b9fc9ab..b6ad6bfa 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: Release diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7092f905..268ef854 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial name: Test diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 32893041..9a1b96c7 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial kind: UDSBundle metadata: diff --git a/bundle/uds-config.yaml b/bundle/uds-config.yaml index e5825022..df1f16ce 100644 --- a/bundle/uds-config.yaml +++ b/bundle/uds-config.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial options: log_level: debug diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 4c16e2fc..0b781a8a 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial apiVersion: v2 name: chart diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml index b2d01d5a..3c4b80ee 100644 --- a/chart/templates/uds-package.yaml +++ b/chart/templates/uds-package.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial apiVersion: uds.dev/v1alpha1 kind: Package diff --git a/chart/values.yaml b/chart/values.yaml index 4ae0a75f..604fcc82 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial domain: "###ZARF_VAR_DOMAIN###" diff --git a/common/zarf.yaml b/common/zarf.yaml index 60103283..84f752e7 100644 --- a/common/zarf.yaml +++ b/common/zarf.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial # yaml-language-server: $schema=https://raw.githubusercontent.com/zarf-dev/zarf/main/zarf.schema.json kind: ZarfPackageConfig diff --git a/oscal-component.yaml b/oscal-component.yaml index c8abd0e0..23af3ea5 100644 --- a/oscal-component.yaml +++ b/oscal-component.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial # add the descriptions inline component-definition: diff --git a/src/nginx/Chart.yaml b/src/nginx/Chart.yaml index be726553..8a339569 100644 --- a/src/nginx/Chart.yaml +++ b/src/nginx/Chart.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial apiVersion: v2 name: nginx diff --git a/src/nginx/templates/configmap.yaml b/src/nginx/templates/configmap.yaml index 6d864989..2a96b6ed 100644 --- a/src/nginx/templates/configmap.yaml +++ b/src/nginx/templates/configmap.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial apiVersion: v1 kind: ConfigMap diff --git a/src/nginx/templates/deployment.yaml b/src/nginx/templates/deployment.yaml index f4d0ba4b..1d1878e3 100644 --- a/src/nginx/templates/deployment.yaml +++ b/src/nginx/templates/deployment.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial apiVersion: apps/v1 kind: Deployment diff --git a/src/nginx/templates/hpa.yaml b/src/nginx/templates/hpa.yaml index d0c80378..fcce9abb 100644 --- a/src/nginx/templates/hpa.yaml +++ b/src/nginx/templates/hpa.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial {{- if .Values.autoscaling.enabled }} apiVersion: autoscaling/v2 diff --git a/src/nginx/templates/ingress.yaml b/src/nginx/templates/ingress.yaml index 1e1b9ccd..f5a7bcb3 100644 --- a/src/nginx/templates/ingress.yaml +++ b/src/nginx/templates/ingress.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial {{- if .Values.ingress.enabled -}} {{- $fullName := include "nginx.fullname" . -}} diff --git a/src/nginx/templates/service-metrics.yaml b/src/nginx/templates/service-metrics.yaml index 1f015797..a6548c5a 100644 --- a/src/nginx/templates/service-metrics.yaml +++ b/src/nginx/templates/service-metrics.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial apiVersion: v1 kind: Service diff --git a/src/nginx/templates/service.yaml b/src/nginx/templates/service.yaml index 611020c3..28d9ef1d 100644 --- a/src/nginx/templates/service.yaml +++ b/src/nginx/templates/service.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial apiVersion: v1 kind: Service diff --git a/src/nginx/templates/serviceaccount.yaml b/src/nginx/templates/serviceaccount.yaml index bae8ff70..df18cb31 100644 --- a/src/nginx/templates/serviceaccount.yaml +++ b/src/nginx/templates/serviceaccount.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial {{- if .Values.serviceAccount.create }} apiVersion: v1 diff --git a/src/nginx/templates/tests/test-connection.yaml b/src/nginx/templates/tests/test-connection.yaml index e4846625..dc177ec1 100644 --- a/src/nginx/templates/tests/test-connection.yaml +++ b/src/nginx/templates/tests/test-connection.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial apiVersion: v1 kind: Pod diff --git a/src/nginx/values.yaml b/src/nginx/values.yaml index bba7847d..064400b4 100644 --- a/src/nginx/values.yaml +++ b/src/nginx/values.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial # Default values for nginx. # This is a YAML-formatted file. diff --git a/tasks.yaml b/tasks.yaml index 259d95f8..b930fb1a 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial includes: - setup: ./tasks/setup.yaml diff --git a/tasks/actions.yaml b/tasks/actions.yaml index 259c0260..97beb829 100644 --- a/tasks/actions.yaml +++ b/tasks/actions.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial variables: - name: REGISTRY1_USERNAME diff --git a/tasks/badge.yaml b/tasks/badge.yaml index 90687c27..a4d57f53 100644 --- a/tasks/badge.yaml +++ b/tasks/badge.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial # yaml-language-server: $schema=https://raw.githubusercontent.com/defenseunicorns/uds-cli/main/tasks.schema.json diff --git a/tasks/compliance.yaml b/tasks/compliance.yaml index c9aeabee..9f05afe6 100644 --- a/tasks/compliance.yaml +++ b/tasks/compliance.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial tasks: - name: validate diff --git a/tasks/create.yaml b/tasks/create.yaml index e28dc85c..c62c8b69 100644 --- a/tasks/create.yaml +++ b/tasks/create.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial variables: - name: FLAVOR diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index 2ee4d5e9..898f14c4 100644 --- a/tasks/deploy.yaml +++ b/tasks/deploy.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial tasks: - name: package diff --git a/tasks/lint.yaml b/tasks/lint.yaml index 1d8d2351..de1e775c 100644 --- a/tasks/lint.yaml +++ b/tasks/lint.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial variables: - name: OSCALFILES @@ -139,9 +139,9 @@ tasks: - name: license description: Lint for the SPDX license identifier being in source files actions: - - cmd: "\"$HOME/go/bin/addlicense\" -l 'AGPL-3.0-or-later OR Commercial' -check -s=only -v -c 'Defense Unicorns' ." + - cmd: "\"$HOME/go/bin/addlicense\" -l 'AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial' -check -s=only -v -c 'Defense Unicorns' ." - name: fix-license description: Add the SPDX license identifier to source files actions: - - cmd: "\"$HOME/go/bin/addlicense\" -l 'AGPL-3.0-or-later OR Commercial' -s=only -v -c 'Defense Unicorns' ." + - cmd: "\"$HOME/go/bin/addlicense\" -l 'AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial' -s=only -v -c 'Defense Unicorns' ." diff --git a/tasks/publish.yaml b/tasks/publish.yaml index 9fb350be..e4f5185d 100644 --- a/tasks/publish.yaml +++ b/tasks/publish.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial includes: - utils: ./utils.yaml diff --git a/tasks/pull.yaml b/tasks/pull.yaml index 3722c63b..ebab4a52 100644 --- a/tasks/pull.yaml +++ b/tasks/pull.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial includes: - utils: https://raw.githubusercontent.com/defenseunicorns/uds-common/7d5f445a50b19e97b9a8bed0d2445654ae05bab6/tasks/utils.yaml diff --git a/tasks/remove.yaml b/tasks/remove.yaml index 080cfdf4..086c8700 100644 --- a/tasks/remove.yaml +++ b/tasks/remove.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial tasks: - name: test-bundle diff --git a/tasks/setup.yaml b/tasks/setup.yaml index c78ec902..4b5c3437 100644 --- a/tasks/setup.yaml +++ b/tasks/setup.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial variables: - name: KEYCLOAK_GROUP diff --git a/tasks/upgrade.yaml b/tasks/upgrade.yaml index eeae1e42..95dfd5dd 100644 --- a/tasks/upgrade.yaml +++ b/tasks/upgrade.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial includes: - utils: https://raw.githubusercontent.com/defenseunicorns/uds-common/7d5f445a50b19e97b9a8bed0d2445654ae05bab6/tasks/utils.yaml diff --git a/tasks/utils.yaml b/tasks/utils.yaml index 85d9066b..133dfb64 100644 --- a/tasks/utils.yaml +++ b/tasks/utils.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial variables: - name: FLAVOR diff --git a/values/common-values.yaml b/values/common-values.yaml index fa7df752..1e9a7bf2 100644 --- a/values/common-values.yaml +++ b/values/common-values.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial securityContext: capabilities: diff --git a/values/registry1-values.yaml b/values/registry1-values.yaml index 8429f7c1..de08c454 100644 --- a/values/registry1-values.yaml +++ b/values/registry1-values.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial image: repository: registry1.dso.mil/ironbank/opensource/nginx/nginx diff --git a/values/unicorn-values.yaml b/values/unicorn-values.yaml index 0fcdba6e..82ad7603 100644 --- a/values/unicorn-values.yaml +++ b/values/unicorn-values.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial image: repository: cgr.dev/du-uds-defenseunicorns/nginx diff --git a/values/upstream-values.yaml b/values/upstream-values.yaml index db65a93d..96f3062b 100644 --- a/values/upstream-values.yaml +++ b/values/upstream-values.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial image: repository: nginx diff --git a/zarf.yaml b/zarf.yaml index 7d61d56b..30248fa4 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -1,5 +1,5 @@ # Copyright 2024 Defense Unicorns -# SPDX-License-Identifier: AGPL-3.0-or-later OR Commercial +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial # yaml-language-server: $schema=https://raw.githubusercontent.com/zarf-dev/zarf/main/zarf.schema.json kind: ZarfPackageConfig From 37840c1a445030d77b42afd2377eefc65a7232ea Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 9 Oct 2024 14:39:40 -0600 Subject: [PATCH 07/10] fix CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index c954f36a..b52ee6df 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -9,4 +9,4 @@ # Additional privileged files /CODEOWNERS @jeff-mccoy @daveworth -/LICENSE* @jeff-mccoy @daveworth +/LICENSE* @jeff-mccoy @austenbryan From d52a4ec909c8c9da5cb28898b3e146e2baa25d86 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 9 Oct 2024 14:40:58 -0600 Subject: [PATCH 08/10] fix CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index b52ee6df..e2fdd4de 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -9,4 +9,4 @@ # Additional privileged files /CODEOWNERS @jeff-mccoy @daveworth -/LICENSE* @jeff-mccoy @austenbryan +/LICENS* @jeff-mccoy @austenbryan From 6976000ec3a0370913917ba931778ed882113500 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Wed, 9 Oct 2024 14:41:30 -0600 Subject: [PATCH 09/10] fix CODEOWNERS --- CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/CODEOWNERS b/CODEOWNERS index e2fdd4de..a60f1fd5 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -9,4 +9,5 @@ # Additional privileged files /CODEOWNERS @jeff-mccoy @daveworth +# NOTE: No E to catch LICENSE and LICENSING /LICENS* @jeff-mccoy @austenbryan From 04938d3d1f53209a975fa86d8478314089c5f400 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Thu, 10 Oct 2024 15:56:38 -0600 Subject: [PATCH 10/10] clarify wording --- LICENSING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSING.md b/LICENSING.md index e4942dde..a439b77d 100644 --- a/LICENSING.md +++ b/LICENSING.md @@ -7,12 +7,12 @@ This software is licensed under either of: ## Defense Unicorns Commercial License -The use of this software under a commercial license is subject to the terms -of the license agreement between the licensee and Defense Unicorns. The +The use of this software under a commercial license is subject to the individual +terms of the license agreement between the licensee and Defense Unicorns. The content of this license depends on the specific agreement and may vary. For more information about obtaining a commercial license, please contact Defense Unicorns at [defenseunicorns.com](https://defenseunicorns.com). -To use this software under the commercial license, you must have a valid -license agreement with Defense Unicorns. The terms of that license agreement -replace the terms of the AGPL v3 license. +To use this software under the commercial license, you must have a valid license +agreement with Defense Unicorns. The terms of the Defense Unicorns, Inc. license +agreement supplant and supersede the terms of the AGPL v3 license.