diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..4d62fa0 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,57 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: qusal +Upstream-Contact: Benjamin Grande Miranda de Sousa +Source: https://github.com/ben-grande/qusal + +Files: * +Copyright: 2023 Qusal contributors +License: GPL-3.0-or-later + +Files: .gitignore .pre-commit-config.yaml .salt-lint README.md minion.d/qusal.conf +Copyright: 2023 Qusal contributors +License: GPL-3.0-or-later + +Files: */README.md +Copyright: 2023 Qusal contributors +License: GPL-3.0-or-later + +Files: qusal/ansible/files/repo/* +Copyright: 2014 Launchpad PPA for Ansible, Inc. +License: CC0-1.0 + +Files: qusal/browser/files/repo/* +Copyright: 2007 Google Inc. +License: CC0-1.0 + +Files: qusal/docker/files/repo/* +Copyright: 2017 Docker Inc. +License: CC0-1.0 + +Files: qusal/signal/files/repo/* +Copyright: 2017 Open Whisper Systems +License: CC0-1.0 + +Files: qusal/sys-syncthing/files/repo/* +Copyright: 2014 The Syncthing Project +License: CC0-1.0 + +Files: qusal/terraform/files/repo/* +Copyright: 2023 HashiCorp Inc. +License: CC0-1.0 + +Files: qusal/dotfiles/files/git/.config/git/message +Copyright: 2023 Qusal contributors +License: CC0-1.0 + +Files: qusal/qubes-builder/files/keys/* +Copyright: The Qubes OS Project + Frédéric Pierret + Marek Marczykowski-Górecki + Simon Gaiser +License: CC0-1.0 + +Files: qusal/dotfiles/files/sh/.config/less/lesskey-old +Copyright: 2023 Qusal contributors +License: GPL-3.0-or-later + +# vim: ft=debcopyright diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d12d106 --- /dev/null +++ b/COPYING @@ -0,0 +1,15 @@ +Qusal - Salt Formulas for Qubes OS +Copyright (C) 2023 Qusal contributors + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 94a9ed0..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 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 General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is 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. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - 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. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - 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 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. Use with the GNU Affero General Public License. - - 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 Affero 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 special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU 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 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 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 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 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - 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 GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/LICENSES/BSD-2-Clause.txt b/LICENSES/BSD-2-Clause.txt new file mode 100644 index 0000000..b6be8c1 --- /dev/null +++ b/LICENSES/BSD-2-Clause.txt @@ -0,0 +1,22 @@ +Copyright (c) 2012-2013, Jacob Appelbaum +Copyright (c) 2012-2013, Sukhbir Singh +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/LICENSES/GPL-2.0-only.txt b/LICENSES/GPL-2.0-only.txt new file mode 100644 index 0000000..53c96b9 --- /dev/null +++ b/LICENSES/GPL-2.0-only.txt @@ -0,0 +1,313 @@ +GNU GENERAL PUBLIC LICENSE Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + +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 this service 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. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These +restrictions translate to certain responsibilities for you if you distribute +copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must +make sure that they, too, receive or can get the source code. And you must +show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must be licensed for +everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each licensee is addressed as +"you". + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its +contents constitute a work based on the Program (independent of having been +made by running the Program). Whether that is true depends on what the Program +does. + +1. You may copy and distribute 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 and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may +at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you +also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole + or in part contains or is derived from the Program or any part thereof, + to be licensed as a whole at no charge to all third parties under the + terms of this License. + + c) If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use in + the most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a + copy of this License. (Exception: if the Program itself is interactive + but does not normally print such an announcement, your work based on the + Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, +and its terms, do not apply to those sections when you distribute them as +separate works. But when you distribute the same sections as part of a whole +which is a work based on the Program, the distribution of the whole must be on +the terms of this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on +the Program. + +In addition, mere aggregation of another work not based on the Program with +the Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and +2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above + on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only + for noncommercial distribution and only if you received the program in + object code or executable form with such an offer, in accord with + Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and +installation of the executable. However, as a special exception, the source +code distributed need not include anything that is normally distributed (in +either source or binary form) with the major components (compiler, kernel, and +so on) of the operating system on which the executable runs, unless that +component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy the +source code from the same place counts as distribution of the source code, +even though third parties are not compelled to copy the source along with the +object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you do +not accept this License. Therefore, by modifying or distributing the Program +(or any work based on the Program), you indicate your acceptance of this +License to do so, and all its terms and conditions for copying, distributing +or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor to +copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of the +rights granted herein. You are not responsible for enforcing compliance by +third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original +copyright holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In +such case, this License incorporates the limitation as if written in the body +of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the +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 a version number of this License which applies to it and "any later +version", you have the option of following the terms and conditions either of +that version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of this License, +you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +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. + +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 convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + + one line to give the program's name and an idea of what it does. + Copyright (C) yyyy name of author + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 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 General + Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add + information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it +starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision + comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is + free software, and you are welcome to redistribute it under certain + conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + +signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice diff --git a/LICENSES/GPL-3.0-only.txt b/LICENSES/GPL-3.0-only.txt new file mode 100644 index 0000000..5862f1a --- /dev/null +++ b/LICENSES/GPL-3.0-only.txt @@ -0,0 +1,613 @@ +GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 + +Copyright © 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 General Public License is a free, copyleft license for software and +other kinds of works. + +The licenses for most software and other practical works are designed to take +away your freedom to share and change the works. By contrast, the GNU General +Public License is 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. We, the Free Software Foundation, use the GNU General Public License +for most of our software; it applies also to any other work released this way + by its authors. You can apply it to your programs, too. + +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. + +To protect your rights, we need to prevent others from denying you these +rights or asking you to surrender the rights. Therefore, you have certain +responsibilities if you distribute copies of the software, or if you modify +it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must pass on to the recipients the same freedoms that you received. +You must make sure that they, too, receive or can get the source code. And you +must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert +copyright on the software, and (2) offer you this License giving you legal +permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that +there is no warranty for this free software. For both users' and authors' +sake, the GPL requires that modified versions be marked as changed, so that +their problems will not be attributed erroneously to authors of previous +versions. + +Some devices are designed to deny users access to install or run modified +versions of the software inside them, although the manufacturer can do so. +This is fundamentally incompatible with the aim of protecting users' freedom +to change the software. The systematic pattern of such abuse occurs in the +area of products for individuals to use, which is precisely where it is most +unacceptable. Therefore, we have designed this version of the GPL to prohibit +the practice for those products. If such problems arise substantially in other +domains, we stand ready to extend this provision to those domains in future +versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States +should not allow patents to restrict development and use of software on +general-purpose computers, but in those that do, we wish to avoid the special +danger that patents applied to a free program could make it effectively +proprietary. To prevent this, the GPL assures that patents cannot be used to +render the program non-free. + +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 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. Use with the GNU Affero General Public License. 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + +14. Revised Versions of this License. The Free Software Foundation may +publish revised and/or new versions of the GNU 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 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 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 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 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 General + Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If the program does terminal interaction, make it output a short notice like +this when it starts in an interactive mode: + + Copyright (C) This program comes with + ABSOLUTELY NO WARRANTY; for details type `show w'. This is free + software, and you are welcome to redistribute it under certain + conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands might +be different; for a GUI interface, you would use an “about box”. + +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 GPL, see +. + +The GNU General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General Public +License instead of this License. But first, please read +. diff --git a/LICENSES/GPL-3.0-or-later.txt b/LICENSES/GPL-3.0-or-later.txt new file mode 100644 index 0000000..5862f1a --- /dev/null +++ b/LICENSES/GPL-3.0-or-later.txt @@ -0,0 +1,613 @@ +GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 + +Copyright © 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 General Public License is a free, copyleft license for software and +other kinds of works. + +The licenses for most software and other practical works are designed to take +away your freedom to share and change the works. By contrast, the GNU General +Public License is 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. We, the Free Software Foundation, use the GNU General Public License +for most of our software; it applies also to any other work released this way + by its authors. You can apply it to your programs, too. + +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. + +To protect your rights, we need to prevent others from denying you these +rights or asking you to surrender the rights. Therefore, you have certain +responsibilities if you distribute copies of the software, or if you modify +it: responsibilities to respect the freedom of others. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must pass on to the recipients the same freedoms that you received. +You must make sure that they, too, receive or can get the source code. And you +must show them these terms so they know their rights. + +Developers that use the GNU GPL protect your rights with two steps: (1) assert +copyright on the software, and (2) offer you this License giving you legal +permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains that +there is no warranty for this free software. For both users' and authors' +sake, the GPL requires that modified versions be marked as changed, so that +their problems will not be attributed erroneously to authors of previous +versions. + +Some devices are designed to deny users access to install or run modified +versions of the software inside them, although the manufacturer can do so. +This is fundamentally incompatible with the aim of protecting users' freedom +to change the software. The systematic pattern of such abuse occurs in the +area of products for individuals to use, which is precisely where it is most +unacceptable. Therefore, we have designed this version of the GPL to prohibit +the practice for those products. If such problems arise substantially in other +domains, we stand ready to extend this provision to those domains in future +versions of the GPL, as needed to protect the freedom of users. + +Finally, every program is threatened constantly by software patents. States +should not allow patents to restrict development and use of software on +general-purpose computers, but in those that do, we wish to avoid the special +danger that patents applied to a free program could make it effectively +proprietary. To prevent this, the GPL assures that patents cannot be used to +render the program non-free. + +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 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. Use with the GNU Affero General Public License. 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 Affero 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 special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + +14. Revised Versions of this License. The Free Software Foundation may +publish revised and/or new versions of the GNU 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 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 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 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 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 General + Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If the program does terminal interaction, make it output a short notice like +this when it starts in an interactive mode: + + Copyright (C) This program comes with + ABSOLUTELY NO WARRANTY; for details type `show w'. This is free + software, and you are welcome to redistribute it under certain + conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands might +be different; for a GUI interface, you would use an “about box”. + +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 GPL, see +. + +The GNU General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General Public +License instead of this License. But first, please read +. diff --git a/LICENSES/Vim.txt b/LICENSES/Vim.txt new file mode 100644 index 0000000..dd68529 --- /dev/null +++ b/LICENSES/Vim.txt @@ -0,0 +1,78 @@ +VIM LICENSE + +I) There are no restrictions on distributing unmodified copies of Vim except + that they must include this license text. You can also distribute + unmodified parts of Vim, likewise unrestricted except that they must + include this license text. You are also allowed to include executables + that you made from the unmodified Vim sources, plus your own usage + examples and Vim scripts. + +II) It is allowed to distribute a modified (or extended) version of Vim, + including executables and/or source code, when the following four + conditions are met: + 1) This license text must be included unmodified. + 2) The modified Vim must be distributed in one of the following five ways: + a) If you make changes to Vim yourself, you must clearly describe in + the distribution how to contact you. When the maintainer asks you + (in any way) for a copy of the modified Vim you distributed, you + must make your changes, including source code, available to the + maintainer without fee. The maintainer reserves the right to + include your changes in the official version of Vim. What the + maintainer will do with your changes and under what license they + will be distributed is negotiable. If there has been no negotiation + then this license, or a later version, also applies to your changes. + The current maintainer is Bram Moolenaar . If this + changes it will be announced in appropriate places (most likely + vim.sf.net, www.vim.org and/or comp.editors). When it is completely + impossible to contact the maintainer, the obligation to send him + your changes ceases. Once the maintainer has confirmed that he has + received your changes they will not have to be sent again. + b) If you have received a modified Vim that was distributed as + mentioned under a) you are allowed to further distribute it + unmodified, as mentioned at I). If you make additional changes the + text under a) applies to those changes. + c) Provide all the changes, including source code, with every copy of + the modified Vim you distribute. This may be done in the form of a + context diff. You can choose what license to use for new code you + add. The changes and their license must not restrict others from + making their own changes to the official version of Vim. + d) When you have a modified Vim which includes changes as mentioned + under c), you can distribute it without the source code for the + changes if the following three conditions are met: + - The license that applies to the changes permits you to distribute + the changes to the Vim maintainer without fee or restriction, and + permits the Vim maintainer to include the changes in the official + version of Vim without fee or restriction. + - You keep the changes for at least three years after last + distributing the corresponding modified Vim. When the maintainer + or someone who you distributed the modified Vim to asks you (in + any way) for the changes within this period, you must make them + available to him. + - You clearly describe in the distribution how to contact you. This + contact information must remain valid for at least three years + after last distributing the corresponding modified Vim, or as long + as possible. + e) When the GNU General Public License (GPL) applies to the changes, + you can distribute the modified Vim under the GNU GPL version 2 or + any later version. + 3) A message must be added, at least in the output of the ":version" + command and in the intro screen, such that the user of the modified Vim + is able to see that it was modified. When distributing as mentioned + under 2)e) adding the message is only required for as far as this does + not conflict with the license used for the changes. + 4) The contact information as required under 2)a) and 2)d) must not be + removed or changed, except that the person himself can make + corrections. + +III) If you distribute a modified version of Vim, you are encouraged to use + the Vim license for your changes and make them available to the + maintainer, including the source code. The preferred way to do this is + by e-mail or by uploading the files to a server and e-mailing the URL. + If the number of changes is small (e.g., a modified Makefile) e-mailing a + context diff will do. The e-mail address to be used is + + +IV) It is not allowed to remove this license from the distribution of the Vim + sources, parts of it or from a modified version. You may use this + license for previous Vim releases instead of the license that they came + with, at your option. diff --git a/README.md b/README.md index e80536b..496c2a7 100644 --- a/README.md +++ b/README.md @@ -4,37 +4,54 @@ * [Description](#description) * [Installation](#installation) + * [DomU](#domu) + * [Dom0](#dom0) +* [Usage](#usage) * [Format](#format) * [File naming](#file-naming) * [Readme](#readme) * [Qube naming](#qube-naming) * [Qrexec](#qrexec) -* [Copyright](#copyright) +* [Legal](#legal) + * [Copyright](#copyright) + * [License](#license) ## Description -Qusal - Salt Formulas for Qubes OS R4.1. +Qusal - Salt Formulas for Qubes OS. -Qusal's goal: - -- All global preferences customized to use qubes based on minimal templates; -- All service templates with only the necessary programs installed; -- Focus on tasks and usability +Qusal providers a Free and Open Source solution to customizing various tasks +in Qubes OS, from switching PCI handlers to be disposables or app qubes to +installing different pieces of software on dedicated minimal templates. Each project is in a separate directory, but they may interact with other projects. -User policies should always be set on /etc/qubes/policy.d/30-user.policy as -this file will take precedence over the packaged policy. +If you want to edit the access control for any service, such as resolution to +allow, ask, deny or the intended target, you should always use the Qrexec +policy at /etc/qubes/policy.d/30-user.policy, as this file will take +precedence over the packaged policy. ## Installation -Clone this repository: +### Requirements + +- Qubes OS R4.1. +- git + +### DomU + +Clone this repository in an app qube: ```sh git clone https://github.com/ben-grande/qusal.git ~/qusal git clone ssh://git@github.com/ben-grande/qusal.git ~/qusal ``` +### Dom0 + +Before copying anything to Dom0, read [Qubes OS warning about +this procedure](https://www.qubes-os.org/doc/how-to-copy-from-dom0/#copying-to-dom0). + Copy this repository from some qube to Dom0 from Dom0: ```sh mkdir -p ~/QubesIncoming/QUBE @@ -52,14 +69,19 @@ cd qusal ./setup.sh ``` +The RPM Spec is not ready, don't try it unless for development. + +## Usage + Qusal is now installed. Please read the README.md of each project for further information on how to install the desired package. Qubes global settings (qubes-prefs) that will be managed: - **clockvm**: disp-sys-net, sys-net -- **default_audiovmm**: dom0 # TODO +- **default_audiovm**: dom0 # TODO - **default_dispvm**: reader +- **default_guivm**: dom0 # TODO - **default_netvm**: sys-pihole, sys-firewall or disp-sys-firewall - **management_dispvm**: dvm-mgmt - **updatevm**: sys-pihole, sys-firewall or disp-sys-firewall @@ -120,7 +142,9 @@ Qubes global settings (qubes-prefs) that will be managed: 3. Target qube for client script must default to `@default`, but other targets must be allowed via parameters. -## Copyright +## License -Each project has a README.md containing the license name and credits to the -copyright owners. +All original source code is licensed under GPL-3.0-or-later. + +For more accurate information, check the individual files for license and +copyright ownership. diff --git a/TODO.md b/TODO.md deleted file mode 100644 index ad1c3a5..0000000 --- a/TODO.md +++ /dev/null @@ -1,25 +0,0 @@ -# TODO - -## Priority - -- best-practices: use map.jinja to target different OSes - https://docs.saltproject.io/en/latest/topics/best_practices.html -- sys-pgp: split-gpg2 support: Working in R4.1? -- sys-git: support Dom0 as a client, useful for fetching -- sys-cacher: test -- sys-syncthing: test -- terraform: test -- rpm_spec: adapt READMEs to be parsed by the spec builder - -## Medium Priority - -- repos: migrate debian .list to .sources -- sys-usb: - - multiple PCI assignment to different qubes fails due to ext_module_qvm.py - bug - - CTAP support -- sys-net: multiple PCI assignment to be implemented - -## Least Priority - -- sys-vpn: nftables porting, waiting for reviewed version of qubes community -- qubesos-github-io: cannot build locally, waiting for upstream fix diff --git a/copyright.txt b/copyright.txt new file mode 100644 index 0000000..e16858a --- /dev/null +++ b/copyright.txt @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/ansible/README.md b/qusal/ansible/README.md index 4a67999..8e2663d 100644 --- a/qusal/ansible/README.md +++ b/qusal/ansible/README.md @@ -5,12 +5,14 @@ * [Description](#description) * [Installation](#installation) * [Usage](#usage) -* [Copyright](#copyright) ## Description Ansible installation in Qubes OS. +Install Ansible and use it on the "ansible" app qube. + + ## Installation - Top @@ -48,6 +50,3 @@ From the control node `ansible`, test connection to the minion ```sh ssh minion ``` -## Copyright - -License: GPLv2+ diff --git a/qusal/ansible/clone.sls b/qusal/ansible/clone.sls index 9995809..9391fbc 100644 --- a/qusal/ansible/clone.sls +++ b/qusal/ansible/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/ansible/clone.top b/qusal/ansible/clone.top index 8687217..0c3c8ce 100644 --- a/qusal/ansible/clone.top +++ b/qusal/ansible/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/ansible/configure-minion.sls b/qusal/ansible/configure-minion.sls index 81287d2..3a8d64a 100644 --- a/qusal/ansible/configure-minion.sls +++ b/qusal/ansible/configure-minion.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-minion-start-sshd": diff --git a/qusal/ansible/configure-minion.top b/qusal/ansible/configure-minion.top index e010ff2..3fe2b8c 100644 --- a/qusal/ansible/configure-minion.top +++ b/qusal/ansible/configure-minion.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'ansible': - ansible.configure-minion diff --git a/qusal/ansible/configure.sls b/qusal/ansible/configure.sls index bf51837..b3eaf7c 100644 --- a/qusal/ansible/configure.sls +++ b/qusal/ansible/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-autostart-ssh-over-qrexec": diff --git a/qusal/ansible/configure.top b/qusal/ansible/configure.top index 5de08ff..3d24073 100644 --- a/qusal/ansible/configure.top +++ b/qusal/ansible/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'ansible': - ansible.configure diff --git a/qusal/ansible/create.sls b/qusal/ansible/create.sls index bb38528..fed725f 100644 --- a/qusal/ansible/create.sls +++ b/qusal/ansible/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/ansible/create.top b/qusal/ansible/create.top index aebb1fd..b913d18 100644 --- a/qusal/ansible/create.top +++ b/qusal/ansible/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/ansible/files/minion/99-sshd-ansible.conf b/qusal/ansible/files/minion/99-sshd-ansible.conf index e63fae9..29938bf 100644 --- a/qusal/ansible/files/minion/99-sshd-ansible.conf +++ b/qusal/ansible/files/minion/99-sshd-ansible.conf @@ -1 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + PubkeyAuthentication yes + +# vim: ft=sshdconfig diff --git a/qusal/ansible/files/policy/default.policy b/qusal/ansible/files/policy/default.policy index 25e0448..1d62249 100644 --- a/qusal/ansible/files/policy/default.policy +++ b/qusal/ansible/files/policy/default.policy @@ -1,4 +1,6 @@ -## Do not modify this file, create a new policy with with a lower number in the -## file name instead. For example `30-user.policy`. +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + qubes.ConnectTCP +22 {{ sls_path }} @default allow target={{ sls_path }}-minion ## vim:ft=qrexecpolicy diff --git a/qusal/ansible/files/server/99-ssh-ansible.conf b/qusal/ansible/files/server/99-ssh-ansible.conf index 26cf6f3..a61a875 100644 --- a/qusal/ansible/files/server/99-ssh-ansible.conf +++ b/qusal/ansible/files/server/99-ssh-ansible.conf @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + Host minion ansible-minion Hostname 127.0.0.1 Port 22000 diff --git a/qusal/ansible/init.top b/qusal/ansible/init.top index 51b84f8..0fb3f56 100644 --- a/qusal/ansible/init.top +++ b/qusal/ansible/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/ansible/install.sls b/qusal/ansible/install.sls index 4a36b10..7ec6da0 100644 --- a/qusal/ansible/install.sls +++ b/qusal/ansible/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/ansible/install.top b/qusal/ansible/install.top index 9e45875..2dbd04a 100644 --- a/qusal/ansible/install.top +++ b/qusal/ansible/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-ansible': - ansible.install diff --git a/qusal/browser/README.md b/qusal/browser/README.md index 95362f4..13ea288 100644 --- a/qusal/browser/README.md +++ b/qusal/browser/README.md @@ -5,7 +5,7 @@ * [Description](#description) * [Installation](#installation) * [Choose you browser](#choose-you-browser) -* [Copyright](#copyright) +* [Usage](#usage) ## Description @@ -67,6 +67,10 @@ Do not forget to sync the `appmenus`: qubesctl state.apply browser.appmenus ``` -## Copyright +## Usage -License: GPLv2+ +Open a disposable qube simply by clicking on the desktop application +`dvm-browser (dvm): Browser`. + +If you want to use a permanent browser session, create an app qube based on +`tpl-browser`. diff --git a/qusal/browser/appmenus.sls b/qusal/browser/appmenus.sls index 0211ae1..42bafd0 100644 --- a/qusal/browser/appmenus.sls +++ b/qusal/browser/appmenus.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/sync-appmenus.sls' import sync_appmenus -%} {{ sync_appmenus('tpl-' ~ sls_path) }} diff --git a/qusal/browser/appmenus.top b/qusal/browser/appmenus.top index a375038..ca0f514 100644 --- a/qusal/browser/appmenus.top +++ b/qusal/browser/appmenus.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/browser/clone.sls b/qusal/browser/clone.sls index 9995809..9391fbc 100644 --- a/qusal/browser/clone.sls +++ b/qusal/browser/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/browser/clone.top b/qusal/browser/clone.top index 6961e1e..be28583 100644 --- a/qusal/browser/clone.top +++ b/qusal/browser/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/browser/create.sls b/qusal/browser/create.sls index 7f593f4..548af2a 100644 --- a/qusal/browser/create.sls +++ b/qusal/browser/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/browser/create.top b/qusal/browser/create.top index ed4df32..ff0fe48 100644 --- a/qusal/browser/create.top +++ b/qusal/browser/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/browser/init.top b/qusal/browser/init.top index de8c9f1..cac5376 100644 --- a/qusal/browser/init.top +++ b/qusal/browser/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/browser/install-chrome.sls b/qusal/browser/install-chrome.sls index 77e6c82..4511b96 100644 --- a/qusal/browser/install-chrome.sls +++ b/qusal/browser/install-chrome.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/browser/install-chrome.top b/qusal/browser/install-chrome.top index def0eba..6e3435b 100644 --- a/qusal/browser/install-chrome.top +++ b/qusal/browser/install-chrome.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-browser': - browser.install-chrome diff --git a/qusal/browser/install-chromium.sls b/qusal/browser/install-chromium.sls index bcd2356..ab5e70b 100644 --- a/qusal/browser/install-chromium.sls +++ b/qusal/browser/install-chromium.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/browser/install-chromium.top b/qusal/browser/install-chromium.top index af2f618..5a92018 100644 --- a/qusal/browser/install-chromium.top +++ b/qusal/browser/install-chromium.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-browser': - browser.install-chromium diff --git a/qusal/browser/install-common.sls b/qusal/browser/install-common.sls index b145bfd..0d2b847 100644 --- a/qusal/browser/install-common.sls +++ b/qusal/browser/install-common.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/browser/install-common.top b/qusal/browser/install-common.top index 4a4c6db..810e3e7 100644 --- a/qusal/browser/install-common.top +++ b/qusal/browser/install-common.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-browser': - browser.install-common diff --git a/qusal/browser/install-firefox.sls b/qusal/browser/install-firefox.sls index 08c7f4e..5ea223d 100644 --- a/qusal/browser/install-firefox.sls +++ b/qusal/browser/install-firefox.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/browser/install-firefox.top b/qusal/browser/install-firefox.top index 62ebb3d..de6f1f6 100644 --- a/qusal/browser/install-firefox.top +++ b/qusal/browser/install-firefox.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-browser': - browser.install-firefox diff --git a/qusal/browser/install-lynx.sls b/qusal/browser/install-lynx.sls index 9de41df..e194967 100644 --- a/qusal/browser/install-lynx.sls +++ b/qusal/browser/install-lynx.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/browser/install-lynx.top b/qusal/browser/install-lynx.top index 5d33920..cc32828 100644 --- a/qusal/browser/install-lynx.top +++ b/qusal/browser/install-lynx.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-browser': - browser.install-lynx diff --git a/qusal/browser/install-w3m.sls b/qusal/browser/install-w3m.sls index 8bd3973..b37aeba 100644 --- a/qusal/browser/install-w3m.sls +++ b/qusal/browser/install-w3m.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/browser/install-w3m.top b/qusal/browser/install-w3m.top index e8e26dc..88281e9 100644 --- a/qusal/browser/install-w3m.top +++ b/qusal/browser/install-w3m.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-browser': - browser.install-w3m diff --git a/qusal/browser/install.sls b/qusal/browser/install.sls index b1d16bf..204d70c 100644 --- a/qusal/browser/install.sls +++ b/qusal/browser/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/browser/install.top b/qusal/browser/install.top index 6e1b77d..0793ca5 100644 --- a/qusal/browser/install.top +++ b/qusal/browser/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-browser': - browser.install diff --git a/qusal/debian-minimal/README.md b/qusal/debian-minimal/README.md new file mode 100644 index 0000000..4023ae1 --- /dev/null +++ b/qusal/debian-minimal/README.md @@ -0,0 +1,24 @@ +# debian-minimal + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) + +## Description + +Download and configure the Debian Minimal Template. + +## Installation + +- Top: +```sh +qubesctl top.enable debian-minimal +qubesctl --targets=debian-12-minimal state.apply +qubesctl top.disable debian-minimal +``` +- State: +```sh +qubesctl state.apply debian-minimal.create +qubesctl --skip-dom0 --targets=debian-12-minimal state.apply debian-minimal.install +``` diff --git a/qusal/debian-minimal/clone.sls b/qusal/debian-minimal/clone.sls new file mode 100644 index 0000000..8a9c05e --- /dev/null +++ b/qusal/debian-minimal/clone.sls @@ -0,0 +1,12 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import slsdotpath ~ "/template.jinja" as template -%} + +"{{ template.template }}-template-installed": + qvm.template_installed: + - name: {{ template.template }} + - fromrepo: {{ template.repo }} diff --git a/qusal/debian-minimal/clone.top b/qusal/debian-minimal/clone.top new file mode 100644 index 0000000..ddf59b1 --- /dev/null +++ b/qusal/debian-minimal/clone.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - debian-minimal.clone diff --git a/qusal/templates/debian-minimal/create.sls b/qusal/debian-minimal/create.sls similarity index 76% rename from qusal/templates/debian-minimal/create.sls rename to qusal/debian-minimal/create.sls index 31cdfd3..f889d49 100644 --- a/qusal/templates/debian-minimal/create.sls +++ b/qusal/debian-minimal/create.sls @@ -1,13 +1,19 @@ -{%- import "templates/debian-minimal.jinja" as template -%} +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import slsdotpath ~ "/template.jinja" as template -%} include: - - templates.{{ template.template_clean }}.clone + - .clone "{{ template.template_clean }}": qvm.vm: - name: {{ template.template_clean }} - require: - - sls: templates.{{ template.template_clean }}.clone + - sls: {{ template.template_clean }}.clone - present: - label: black - prefs: @@ -32,7 +38,7 @@ include: qvm.vm: - name: dvm-{{ template.template_clean }} - require: - - sls: templates.{{ template.template_clean }}.clone + - sls: {{ template.template_clean }}.clone - present: - template: {{ template.template }} - label: red @@ -47,6 +53,8 @@ include: - features: - enable: - appmenus-dispvm + - set: + - menu-items: "qubes-open-file-manager.desktop qubes-run-terminal.desktop qubes-start.desktop" "{{ slsdotpath }}-set-default_template": cmd.run: diff --git a/qusal/debian-minimal/create.top b/qusal/debian-minimal/create.top new file mode 100644 index 0000000..bb0f101 --- /dev/null +++ b/qusal/debian-minimal/create.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - debian-minimal.create diff --git a/qusal/debian-minimal/init.top b/qusal/debian-minimal/init.top new file mode 100644 index 0000000..97ebc09 --- /dev/null +++ b/qusal/debian-minimal/init.top @@ -0,0 +1,13 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - debian-minimal.create + 'I@qubes:type:template and E@^debian-[0-9][0-9]-minimal$': + - match: compound + - debian-minimal.install diff --git a/qusal/templates/debian-minimal/install.sls b/qusal/debian-minimal/install.sls similarity index 82% rename from qusal/templates/debian-minimal/install.sls rename to qusal/debian-minimal/install.sls index 2164029..c939399 100644 --- a/qusal/templates/debian-minimal/install.sls +++ b/qusal/debian-minimal/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' and grains['os_family']|lower == 'debian' -%} include: diff --git a/qusal/debian-minimal/install.top b/qusal/debian-minimal/install.top new file mode 100644 index 0000000..56f22d5 --- /dev/null +++ b/qusal/debian-minimal/install.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'I@qubes:type:template and E@^debian-[0-9][0-9]-minimal$': + - match: compound + - debian-minimal.install diff --git a/qusal/templates/fedora-minimal.jinja b/qusal/debian-minimal/template.jinja similarity index 57% rename from qusal/templates/fedora-minimal.jinja rename to qusal/debian-minimal/template.jinja index d516cc9..711ab9e 100644 --- a/qusal/templates/fedora-minimal.jinja +++ b/qusal/debian-minimal/template.jinja @@ -1,4 +1,10 @@ -{%- import "templates/fedora.jinja" as template_base -%} +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import "debian/template.jinja" as template_base -%} {% set version = template_base.version -%} {% set repo = template_base.repo -%} {% set template = template_base.template ~ '-minimal' -%} diff --git a/qusal/debian/README.md b/qusal/debian/README.md new file mode 100644 index 0000000..5dcc39a --- /dev/null +++ b/qusal/debian/README.md @@ -0,0 +1,24 @@ +# debian + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) + +## Description + +Download and configure the Debian Template. + +## Installation + +- Top: +```sh +qubesctl top.enable debian +qubesctl --targets=debian-12 state.apply +qubesctl top.disable debian +``` +- State: +```sh +qubesctl state.apply debian.create +qubesctl --skip-dom0 --targets=debian-12 state.apply debian.install +``` diff --git a/qusal/debian/clone.sls b/qusal/debian/clone.sls new file mode 100644 index 0000000..8a9c05e --- /dev/null +++ b/qusal/debian/clone.sls @@ -0,0 +1,12 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import slsdotpath ~ "/template.jinja" as template -%} + +"{{ template.template }}-template-installed": + qvm.template_installed: + - name: {{ template.template }} + - fromrepo: {{ template.repo }} diff --git a/qusal/debian/clone.top b/qusal/debian/clone.top new file mode 100644 index 0000000..ef89ce2 --- /dev/null +++ b/qusal/debian/clone.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - debian.clone diff --git a/qusal/templates/debian/create.sls b/qusal/debian/create.sls similarity index 76% rename from qusal/templates/debian/create.sls rename to qusal/debian/create.sls index d6cba1a..0b7f3a4 100644 --- a/qusal/templates/debian/create.sls +++ b/qusal/debian/create.sls @@ -1,13 +1,19 @@ -{%- import "templates/debian.jinja" as template -%} +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import slsdotpath ~ "/template.jinja" as template -%} include: - - templates.{{ template.template_clean }}.clone + - .clone "{{ template.template_clean }}": qvm.vm: - name: {{ template.template_clean }} - require: - - sls: templates.{{ template.template_clean }}.clone + - sls: {{ slsdotpath }}.clone - present: - label: black - prefs: @@ -32,7 +38,7 @@ include: qvm.vm: - name: dvm-{{ template.template_clean }} - require: - - sls: templates.{{ template.template_clean }}.clone + - sls: {{ slsdotpath }}.clone - present: - template: {{ template.template }} - label: red @@ -47,3 +53,5 @@ include: - features: - enable: - appmenus-dispvm + - set: + - menu-items: "qubes-open-file-manager.desktop qubes-run-terminal.desktop qubes-start.desktop" diff --git a/qusal/debian/create.top b/qusal/debian/create.top new file mode 100644 index 0000000..4524a8a --- /dev/null +++ b/qusal/debian/create.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - debian.create diff --git a/qusal/debian/init.top b/qusal/debian/init.top new file mode 100644 index 0000000..109736c --- /dev/null +++ b/qusal/debian/init.top @@ -0,0 +1,13 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - debian.create + 'I@qubes:type:template and E@^debian-[0-9][0-9]$': + - match: compound + - debian.install diff --git a/qusal/templates/debian/install.sls b/qusal/debian/install.sls similarity index 54% rename from qusal/templates/debian/install.sls rename to qusal/debian/install.sls index c1f5dda..c23907c 100644 --- a/qusal/templates/debian/install.sls +++ b/qusal/debian/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated": diff --git a/qusal/debian/install.top b/qusal/debian/install.top new file mode 100644 index 0000000..c9826c5 --- /dev/null +++ b/qusal/debian/install.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'I@qubes:type:template and E@^debian-[0-9][0-9]$': + - match: compound + - debian.install diff --git a/qusal/templates/debian.jinja b/qusal/debian/template.jinja similarity index 69% rename from qusal/templates/debian.jinja rename to qusal/debian/template.jinja index 5c5c1e3..64a3684 100644 --- a/qusal/templates/debian.jinja +++ b/qusal/debian/template.jinja @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% set version = salt['pillar.get']('qvm:debian:version', '12') -%} {% set repo = salt['pillar.get']('qvm:debian:repo', 'qubes-templates-itl') -%} {% set template = 'debian-' ~ version -%} diff --git a/qusal/dev/README.md b/qusal/dev/README.md index a934380..28e14fe 100644 --- a/qusal/dev/README.md +++ b/qusal/dev/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -29,7 +28,3 @@ qubesctl state.apply dev.create qubesctl --skip-dom0 --targets=tpl-dev state.apply dev.install qubesctl --skip-dom0 --targets=dev state.apply dev.configure ``` - -## Copyright - -License: GPLv3+ diff --git a/qusal/dev/clone.sls b/qusal/dev/clone.sls index 9995809..9391fbc 100644 --- a/qusal/dev/clone.sls +++ b/qusal/dev/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/dev/clone.top b/qusal/dev/clone.top index cbe0de4..6362834 100644 --- a/qusal/dev/clone.top +++ b/qusal/dev/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/dev/configure.sls b/qusal/dev/configure.sls index 46fe6ce..724800f 100644 --- a/qusal/dev/configure.sls +++ b/qusal/dev/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/dev/create.sls b/qusal/dev/create.sls index cd5da3a..4ec5635 100644 --- a/qusal/dev/create.sls +++ b/qusal/dev/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/dev/create.top b/qusal/dev/create.top index c2287d0..abbe880 100644 --- a/qusal/dev/create.top +++ b/qusal/dev/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/dev/home-cleanup.sls b/qusal/dev/home-cleanup.sls index 8dee2a8..275dce0 100644 --- a/qusal/dev/home-cleanup.sls +++ b/qusal/dev/home-cleanup.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} {% for unused_dir in ['Desktop','Documents','Downloads','Music','Pictures','Public','Templates','Videos'] -%} diff --git a/qusal/dev/home-cleanup.top b/qusal/dev/home-cleanup.top index b290604..17ee3dd 100644 --- a/qusal/dev/home-cleanup.top +++ b/qusal/dev/home-cleanup.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dev': - dev.home-cleanup diff --git a/qusal/dev/init.sls b/qusal/dev/init.sls index 65916d3..6923c05 100644 --- a/qusal/dev/init.sls +++ b/qusal/dev/init.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + ## TODO: should we allow minions to decide which states they should run? {# include: diff --git a/qusal/dev/init.top b/qusal/dev/init.top index b7fe09a..b30cb70 100644 --- a/qusal/dev/init.top +++ b/qusal/dev/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/dev/install-python-tools.sls b/qusal/dev/install-python-tools.sls index 4d2cdfb..dc04a35 100644 --- a/qusal/dev/install-python-tools.sls +++ b/qusal/dev/install-python-tools.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated-network": diff --git a/qusal/dev/install-python-tools.top b/qusal/dev/install-python-tools.top index 41b159c..aa70904 100644 --- a/qusal/dev/install-python-tools.top +++ b/qusal/dev/install-python-tools.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-dev': - dev.install-python-tools diff --git a/qusal/dev/install-salt-tools.sls b/qusal/dev/install-salt-tools.sls index a535df9..457b452 100644 --- a/qusal/dev/install-salt-tools.sls +++ b/qusal/dev/install-salt-tools.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated-salt-tools": diff --git a/qusal/dev/install-salt-tools.top b/qusal/dev/install-salt-tools.top index 045b55a..6194a7f 100644 --- a/qusal/dev/install-salt-tools.top +++ b/qusal/dev/install-salt-tools.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-dev': - dev.install-salt-tools diff --git a/qusal/dev/install.sls b/qusal/dev/install.sls index 822414d..c8a431b 100644 --- a/qusal/dev/install.sls +++ b/qusal/dev/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/dev/install.top b/qusal/dev/install.top index 0957761..1446814 100644 --- a/qusal/dev/install.top +++ b/qusal/dev/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-dev': - match: list diff --git a/qusal/docker/README.md b/qusal/docker/README.md index 40b4365..6491100 100644 --- a/qusal/docker/README.md +++ b/qusal/docker/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -26,7 +25,3 @@ qubesctl top.disable docker qubesctl --skip-dom0 --targets=tpl-qubes-builder state.apply docker.install qubesctl --skip-dom0 --targets=qubes-builder state.apply docker.configure ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/docker/configure.sls b/qusal/docker/configure.sls index 31709d8..2c43d29 100644 --- a/qusal/docker/configure.sls +++ b/qusal/docker/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-rc.local": diff --git a/qusal/docker/configure.top b/qusal/docker/configure.top index c6e508c..2529cf7 100644 --- a/qusal/docker/configure.top +++ b/qusal/docker/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'qubes-builder': - docker.configure diff --git a/qusal/docker/init.top b/qusal/docker/init.top index 3b60ac5..cb0865a 100644 --- a/qusal/docker/init.top +++ b/qusal/docker/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-qubes-builder': - docker.install diff --git a/qusal/docker/install.sls b/qusal/docker/install.sls index 5078a1f..e4fca2f 100644 --- a/qusal/docker/install.sls +++ b/qusal/docker/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} {% from 'utils/macros/install-repo.sls' import install_repo -%} diff --git a/qusal/docker/install.top b/qusal/docker/install.top index 9d74a61..fa43d1e 100644 --- a/qusal/docker/install.top +++ b/qusal/docker/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-qubes-builder': - docker.install diff --git a/qusal/dom0/README.md b/qusal/dom0/README.md index 79ed773..d8cb0b3 100644 --- a/qusal/dom0/README.md +++ b/qusal/dom0/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -25,7 +24,3 @@ qubesctl top.disable dom0 ```sh qubesctl state.apply dom0 ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/dom0/backup.sls b/qusal/dom0/backup.sls index 5992dd7..d691c40 100644 --- a/qusal/dom0/backup.sls +++ b/qusal/dom0/backup.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-backup-find-script": file.managed: - name: /usr/bin/qvm-backup-find-last diff --git a/qusal/dom0/backup.top b/qusal/dom0/backup.top index 1e2dcf8..ade6aa3 100644 --- a/qusal/dom0/backup.top +++ b/qusal/dom0/backup.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/dom0/dotfiles.sls b/qusal/dom0/dotfiles.sls index d72501b..6aac8e1 100644 --- a/qusal/dom0/dotfiles.sls +++ b/qusal/dom0/dotfiles.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] == 'dom0' -%} include: diff --git a/qusal/dom0/dotfiles.top b/qusal/dom0/dotfiles.top index befee11..efcf7ff 100644 --- a/qusal/dom0/dotfiles.top +++ b/qusal/dom0/dotfiles.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier b/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier index e27544f..9c91d81 100755 --- a/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier +++ b/qusal/dom0/files/autostart-scripts/kde-activity-changed-notifier @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + set -eu if ! command -v notify-send >/dev/null && diff --git a/qusal/dom0/files/autostart/xprofile.desktop b/qusal/dom0/files/autostart/xprofile.desktop index 90ad799..a9a60a2 100644 --- a/qusal/dom0/files/autostart/xprofile.desktop +++ b/qusal/dom0/files/autostart/xprofile.desktop @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Desktop Entry] Name=Xprofile sourcer Comment=Source User's Xprofile @@ -5,4 +9,4 @@ Type=Application Exec=/home/user/.config/x11/xprofile Terminal=false StartupNotify=false -Categories=System;X; +Categories=System; diff --git a/qusal/dom0/files/backup/qusal.conf b/qusal/dom0/files/backup/qusal.conf index c7b4cb3..ca7868c 100644 --- a/qusal/dom0/files/backup/qusal.conf +++ b/qusal/dom0/files/backup/qusal.conf @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Sample backup profile --- include: diff --git a/qusal/dom0/files/bin/kde-write-rules b/qusal/dom0/files/bin/kde-write-rules index cb8d2e5..5e2960f 100755 --- a/qusal/dom0/files/bin/kde-write-rules +++ b/qusal/dom0/files/bin/kde-write-rules @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC1090,SC2317 ## Wrapper around kwriteconfig to write key=values to specific groups. ## TODO: finish diff --git a/qusal/dom0/files/bin/qvm-backup-find-last b/qusal/dom0/files/bin/qvm-backup-find-last index 254a687..91c660c 100755 --- a/qusal/dom0/files/bin/qvm-backup-find-last +++ b/qusal/dom0/files/bin/qvm-backup-find-last @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + set -eu usage(){ diff --git a/qusal/dom0/files/sddm.conf.d/qubes.conf b/qusal/dom0/files/sddm.conf.d/qubes.conf index eb55e57..1b75a37 100644 --- a/qusal/dom0/files/sddm.conf.d/qubes.conf +++ b/qusal/dom0/files/sddm.conf.d/qubes.conf @@ -1,2 +1,8 @@ +# SPDX-FileCopyrightText: 2019 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + [XDisplay] ServerArguments=-nolisten tcp -background none + +# vim: ft=systemd diff --git a/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh b/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh index ca20342..3265b73 100755 --- a/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh +++ b/qusal/dom0/files/xinitrc.d/55xfce-qubes.sh @@ -1,5 +1,9 @@ #!/bin/sh +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Use Qubes provided menu instead of the default one. case "$XDG_SESSION_DESKTOP" in KDE|plasma) XDG_MENU_PREFIX="kf5-";; diff --git a/qusal/dom0/files/xorg.conf.d/30-touchpad.conf b/qusal/dom0/files/xorg.conf.d/30-touchpad.conf index 841d5e3..e467a8d 100644 --- a/qusal/dom0/files/xorg.conf.d/30-touchpad.conf +++ b/qusal/dom0/files/xorg.conf.d/30-touchpad.conf @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2019 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + Section "InputClass" Identifier "touchpad catchall" Driver "libinput" diff --git a/qusal/dom0/init.sls b/qusal/dom0/init.sls index f9089f4..6d337ed 100644 --- a/qusal/dom0/init.sls +++ b/qusal/dom0/init.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] == 'dom0' -%} include: diff --git a/qusal/dom0/init.top b/qusal/dom0/init.top index ef82bcd..5a2a24c 100644 --- a/qusal/dom0/init.top +++ b/qusal/dom0/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/dom0/install.sls b/qusal/dom0/install.sls index dca9957..3fdcc66 100644 --- a/qusal/dom0/install.sls +++ b/qusal/dom0/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] == 'dom0' -%} "{{ slsdotpath }}-updated": diff --git a/qusal/dom0/install.top b/qusal/dom0/install.top index 095ddc9..4fb76ad 100644 --- a/qusal/dom0/install.top +++ b/qusal/dom0/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/dom0/kde.sls b/qusal/dom0/kde.sls index 140ac31..7edbf1f 100644 --- a/qusal/dom0/kde.sls +++ b/qusal/dom0/kde.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] == 'dom0' -%} "{{ slsdotpath }}-kde-updated": diff --git a/qusal/dom0/kde.top b/qusal/dom0/kde.top index c5a83ed..ffd664e 100644 --- a/qusal/dom0/kde.top +++ b/qusal/dom0/kde.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/dom0/xorg.sls b/qusal/dom0/xorg.sls index cc54fb4..ebb476f 100644 --- a/qusal/dom0/xorg.sls +++ b/qusal/dom0/xorg.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] == 'dom0' -%} "{{ slsdotpath }}-xorg-updated": diff --git a/qusal/dom0/xorg.top b/qusal/dom0/xorg.top index 600efdf..8f3fcf7 100644 --- a/qusal/dom0/xorg.top +++ b/qusal/dom0/xorg.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/dotfiles/README.md b/qusal/dotfiles/README.md index fc20e75..eecf082 100644 --- a/qusal/dotfiles/README.md +++ b/qusal/dotfiles/README.md @@ -5,7 +5,6 @@ * [Description](#description) * [Installation](#installation) * [Usage](#usage) -* [Copyright](#copyright) ## Description @@ -73,7 +72,3 @@ Supported programs and the expected file names in `$HOME`: - **vim**: .vimrc.local - **x11**: .xprofile.local - **zsh**: .zshrc.local - -## Copyright - -License: GPLv3+ diff --git a/qusal/dotfiles/copy-all.sls b/qusal/dotfiles/copy-all.sls index 5a72336..2a95f98 100644 --- a/qusal/dotfiles/copy-all.sls +++ b/qusal/dotfiles/copy-all.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .copy-git - .copy-gtk diff --git a/qusal/dotfiles/copy-all.top b/qusal/dotfiles/copy-all.top index 3a08cb6..04dba10 100644 --- a/qusal/dotfiles/copy-all.top +++ b/qusal/dotfiles/copy-all.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-all diff --git a/qusal/dotfiles/copy-git.sls b/qusal/dotfiles/copy-git.sls index 196a97c..398c660 100644 --- a/qusal/dotfiles/copy-git.sls +++ b/qusal/dotfiles/copy-git.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-copy-git-home": file.recurse: - name: /home/user diff --git a/qusal/dotfiles/copy-git.top b/qusal/dotfiles/copy-git.top index 6bbf4c7..570054d 100644 --- a/qusal/dotfiles/copy-git.top +++ b/qusal/dotfiles/copy-git.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-git diff --git a/qusal/dotfiles/copy-gtk.sls b/qusal/dotfiles/copy-gtk.sls index 277295d..7bd49a0 100644 --- a/qusal/dotfiles/copy-gtk.sls +++ b/qusal/dotfiles/copy-gtk.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-copy-gtk-home": file.recurse: - name: /home/user/ diff --git a/qusal/dotfiles/copy-gtk.top b/qusal/dotfiles/copy-gtk.top index 52c7741..6008ef0 100644 --- a/qusal/dotfiles/copy-gtk.top +++ b/qusal/dotfiles/copy-gtk.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-gtk diff --git a/qusal/dotfiles/copy-net.sls b/qusal/dotfiles/copy-net.sls index 1ee7434..d806809 100644 --- a/qusal/dotfiles/copy-net.sls +++ b/qusal/dotfiles/copy-net.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-copy-net-home": file.recurse: - name: /home/user/ diff --git a/qusal/dotfiles/copy-net.top b/qusal/dotfiles/copy-net.top index a63816b..6079dff 100644 --- a/qusal/dotfiles/copy-net.top +++ b/qusal/dotfiles/copy-net.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-net diff --git a/qusal/dotfiles/copy-pgp.sls b/qusal/dotfiles/copy-pgp.sls index 591c02d..e870404 100644 --- a/qusal/dotfiles/copy-pgp.sls +++ b/qusal/dotfiles/copy-pgp.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-copy-pgp-home": file.recurse: - name: /home/user/ diff --git a/qusal/dotfiles/copy-pgp.top b/qusal/dotfiles/copy-pgp.top index 2593cf1..d5226b8 100644 --- a/qusal/dotfiles/copy-pgp.top +++ b/qusal/dotfiles/copy-pgp.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-pgp diff --git a/qusal/dotfiles/copy-sh.sls b/qusal/dotfiles/copy-sh.sls index 446f38e..e3cbc27 100644 --- a/qusal/dotfiles/copy-sh.sls +++ b/qusal/dotfiles/copy-sh.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-copy-sh-home": file.recurse: - name: /home/user/ diff --git a/qusal/dotfiles/copy-sh.top b/qusal/dotfiles/copy-sh.top index b6d1009..7c1a8f6 100644 --- a/qusal/dotfiles/copy-sh.top +++ b/qusal/dotfiles/copy-sh.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-sh diff --git a/qusal/dotfiles/copy-ssh.sls b/qusal/dotfiles/copy-ssh.sls index 3c37ed4..1a0acb1 100644 --- a/qusal/dotfiles/copy-ssh.sls +++ b/qusal/dotfiles/copy-ssh.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-copy-ssh-home": file.recurse: - name: /home/user/ diff --git a/qusal/dotfiles/copy-ssh.top b/qusal/dotfiles/copy-ssh.top index 6e8be25..c7679aa 100644 --- a/qusal/dotfiles/copy-ssh.top +++ b/qusal/dotfiles/copy-ssh.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-ssh diff --git a/qusal/dotfiles/copy-tmux.sls b/qusal/dotfiles/copy-tmux.sls index c7657ea..1f9deae 100644 --- a/qusal/dotfiles/copy-tmux.sls +++ b/qusal/dotfiles/copy-tmux.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-copy-tmux-home": file.recurse: - name: /home/user/ diff --git a/qusal/dotfiles/copy-tmux.top b/qusal/dotfiles/copy-tmux.top index 3525d2b..d577c25 100644 --- a/qusal/dotfiles/copy-tmux.top +++ b/qusal/dotfiles/copy-tmux.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-tmux diff --git a/qusal/dotfiles/copy-vim.sls b/qusal/dotfiles/copy-vim.sls index 9ffc1fd..c3fd379 100644 --- a/qusal/dotfiles/copy-vim.sls +++ b/qusal/dotfiles/copy-vim.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-copy-vim-home": file.recurse: - name: /home/user/ diff --git a/qusal/dotfiles/copy-vim.top b/qusal/dotfiles/copy-vim.top index ed65b15..e61271b 100644 --- a/qusal/dotfiles/copy-vim.top +++ b/qusal/dotfiles/copy-vim.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-vim diff --git a/qusal/dotfiles/copy-x11.sls b/qusal/dotfiles/copy-x11.sls index b9427c5..041f18b 100644 --- a/qusal/dotfiles/copy-x11.sls +++ b/qusal/dotfiles/copy-x11.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-copy-x11-home": file.recurse: - name: /home/user/ diff --git a/qusal/dotfiles/copy-x11.top b/qusal/dotfiles/copy-x11.top index 027a4d9..bf06c4b 100644 --- a/qusal/dotfiles/copy-x11.top +++ b/qusal/dotfiles/copy-x11.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - dotfiles.copy-x11 diff --git a/qusal/dotfiles/files/dom0/The Qubes Project/qubes-qube-manager.conf b/qusal/dotfiles/files/dom0/The Qubes Project/qubes-qube-manager.conf index 4df0569..9b159da 100644 --- a/qusal/dotfiles/files/dom0/The Qubes Project/qubes-qube-manager.conf +++ b/qusal/dotfiles/files/dom0/The Qubes Project/qubes-qube-manager.conf @@ -1,4 +1,7 @@ -# vim: ft=toml +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + [General] window_size=@Size(824 500) @@ -30,3 +33,5 @@ templates=true compactview=true sort_column=3 sort_order=0 + +# vim: ft=toml diff --git a/qusal/dotfiles/files/git/.config/git/config b/qusal/dotfiles/files/git/.config/git/config index bb08f66..32e016a 100644 --- a/qusal/dotfiles/files/git/.config/git/config +++ b/qusal/dotfiles/files/git/.config/git/config @@ -1,10 +1,19 @@ ; Global Git Config -; vim: ft=gitconfig + +; SPDX-FileCopyrightText: 2010 - 2017 Tim Pope +; SPDX-FileCopyrightText: 2016 The Qubes OS Project +; SPDX-FileCopyrightText: 2023 Qusal contributors +; +; SPDX-License-Identifier: GPL-2.0-only +; + [alias] ; https://git.wiki.kernel.org/index.php/Aliases + ; https://github.com/schacon/gitscm/tree/master ; Abbreviations co = checkout br = branch + sw = switch ci = commit cm = commit st = status @@ -141,3 +150,5 @@ path = ~/.config/git/config.d/qubes-devel [include] path = ~/.gitconfig.local + +; vim: ft=gitconfig diff --git a/qusal/dotfiles/files/git/.config/git/config.d/qubes-devel b/qusal/dotfiles/files/git/.config/git/config.d/qubes-devel index 6603797..feecb96 100644 --- a/qusal/dotfiles/files/git/.config/git/config.d/qubes-devel +++ b/qusal/dotfiles/files/git/.config/git/config.d/qubes-devel @@ -1,5 +1,10 @@ -; vim: ft=gitconfig +; SPDX-FileCopyrightText: 2023 Qusal contributors +; +; SPDX-License-Identifier: GPL-3.0-or-later + [format] to = qubes-devel@googlegroups.com [sendemail] to = qubes-devel@googlegroups.com + +; vim: ft=gitconfig diff --git a/qusal/dotfiles/files/git/.config/git/ignore b/qusal/dotfiles/files/git/.config/git/ignore index 69d5db8..19fe1b9 100644 --- a/qusal/dotfiles/files/git/.config/git/ignore +++ b/qusal/dotfiles/files/git/.config/git/ignore @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + # Local *.local !.local/ diff --git a/qusal/dotfiles/files/git/.config/git/sample/gitconfig.local.sample b/qusal/dotfiles/files/git/.config/git/sample/gitconfig.local.sample index 5d67eac..14e4743 100644 --- a/qusal/dotfiles/files/git/.config/git/sample/gitconfig.local.sample +++ b/qusal/dotfiles/files/git/.config/git/sample/gitconfig.local.sample @@ -1,6 +1,12 @@ ; ~/.gitconfig.local -; vim: ft=gitconfig + +; SPDX-FileCopyrightText: 2023 Qusal contributors +; +; SPDX-License-Identifier: GPL-3.0-or-later + [user] email = your-mail@your-provider.domain name = Your Name signingKey = 0x012345678ABC + +; vim: ft=gitconfig diff --git a/qusal/dotfiles/files/git/.config/git/shell/.git-shell-lib b/qusal/dotfiles/files/git/.config/git/shell/.git-shell-lib index 848e7a0..08c5b07 100644 --- a/qusal/dotfiles/files/git/.config/git/shell/.git-shell-lib +++ b/qusal/dotfiles/files/git/.config/git/shell/.git-shell-lib @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## guarantee commands are run from $HOME cd diff --git a/qusal/dotfiles/files/git/.config/git/shell/description b/qusal/dotfiles/files/git/.config/git/shell/description index c321893..589ff4f 100755 --- a/qusal/dotfiles/files/git/.config/git/shell/description +++ b/qusal/dotfiles/files/git/.config/git/shell/description @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + set -eu # shellcheck disable=SC1090 diff --git a/qusal/dotfiles/files/git/.config/git/shell/help b/qusal/dotfiles/files/git/.config/git/shell/help index e36381c..9468a26 100755 --- a/qusal/dotfiles/files/git/.config/git/shell/help +++ b/qusal/dotfiles/files/git/.config/git/shell/help @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + set -eu ls ~/git-shell-commands diff --git a/qusal/dotfiles/files/git/.config/git/shell/init b/qusal/dotfiles/files/git/.config/git/shell/init index f02bb60..08334a6 100755 --- a/qusal/dotfiles/files/git/.config/git/shell/init +++ b/qusal/dotfiles/files/git/.config/git/shell/init @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + set -eu # shellcheck disable=SC1090 diff --git a/qusal/dotfiles/files/git/.config/git/shell/list b/qusal/dotfiles/files/git/.config/git/shell/list index c9cb114..81ae39a 100755 --- a/qusal/dotfiles/files/git/.config/git/shell/list +++ b/qusal/dotfiles/files/git/.config/git/shell/list @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + set -eu # shellcheck disable=SC1090 diff --git a/qusal/dotfiles/files/git/.config/git/shell/no-interactive-login b/qusal/dotfiles/files/git/.config/git/shell/no-interactive-login index 440c37d..d50bda7 100755 --- a/qusal/dotfiles/files/git/.config/git/shell/no-interactive-login +++ b/qusal/dotfiles/files/git/.config/git/shell/no-interactive-login @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + set -eu command -v git >/dev/null || exit 1 diff --git a/qusal/dotfiles/files/git/.config/git/template/config b/qusal/dotfiles/files/git/.config/git/template/config index 5779f73..d02d7a7 100644 --- a/qusal/dotfiles/files/git/.config/git/template/config +++ b/qusal/dotfiles/files/git/.config/git/template/config @@ -1,4 +1,7 @@ -; vim: ft=gitconfig +; SPDX-FileCopyrightText: 2023 Qusal contributors +; +; SPDX-License-Identifier: GPL-3.0-or-later + [branch "main"] remote = origin merge = refs/heads/main @@ -10,3 +13,5 @@ logAllRefUpdates = true [init] defaultBranch = main + +; vim: ft=gitconfig diff --git a/qusal/dotfiles/files/git/.config/git/template/hooks/pre-receive b/qusal/dotfiles/files/git/.config/git/template/hooks/pre-receive index 6fb2e16..075ccf3 100755 --- a/qusal/dotfiles/files/git/.config/git/template/hooks/pre-receive +++ b/qusal/dotfiles/files/git/.config/git/template/hooks/pre-receive @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## TODO: unfinished # shellcheck disable=SC2317 exit 0 diff --git a/qusal/dotfiles/files/git/.config/git/template/info/exclude b/qusal/dotfiles/files/git/.config/git/template/info/exclude index 2ad9294..c7ee087 100644 --- a/qusal/dotfiles/files/git/.config/git/template/info/exclude +++ b/qusal/dotfiles/files/git/.config/git/template/info/exclude @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + *.local diff --git a/qusal/dotfiles/files/git/.config/tig/config b/qusal/dotfiles/files/git/.config/tig/config index f206f26..ad6afe5 100644 --- a/qusal/dotfiles/files/git/.config/tig/config +++ b/qusal/dotfiles/files/git/.config/tig/config @@ -1,4 +1,8 @@ -# Key binding source: https://github.com/jonas/tig/blob/master/contrib/vim.tigrc +# SPDX-FileCopyrightText: 2020 Jona Fonseca +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# Credits: https://github.com/jonas/tig/blob/master/contrib/vim.tigrc bind generic h scroll-left bind generic j move-down diff --git a/qusal/dotfiles/files/gtk/.config/gtk-2.0/bookmarks b/qusal/dotfiles/files/gtk/.config/gtk-2.0/bookmarks index 010e834..4ba6b95 100644 --- a/qusal/dotfiles/files/gtk/.config/gtk-2.0/bookmarks +++ b/qusal/dotfiles/files/gtk/.config/gtk-2.0/bookmarks @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + file:///home/user/QubesIncoming diff --git a/qusal/dotfiles/files/gtk/.config/gtk-2.0/gtkrc-2.0 b/qusal/dotfiles/files/gtk/.config/gtk-2.0/gtkrc-2.0 index e437794..54331fe 100644 --- a/qusal/dotfiles/files/gtk/.config/gtk-2.0/gtkrc-2.0 +++ b/qusal/dotfiles/files/gtk/.config/gtk-2.0/gtkrc-2.0 @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + gtk-theme-name=Adwaita-Dark gtk-icon-theme-name=Adwaita gtk-font-name="Sans 10" diff --git a/qusal/dotfiles/files/gtk/.config/gtk-2.0/qubes-incoming-bookmark-created b/qusal/dotfiles/files/gtk/.config/gtk-2.0/qubes-incoming-bookmark-created index e69de29..a513909 100644 --- a/qusal/dotfiles/files/gtk/.config/gtk-2.0/qubes-incoming-bookmark-created +++ b/qusal/dotfiles/files/gtk/.config/gtk-2.0/qubes-incoming-bookmark-created @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/dotfiles/files/gtk/.config/gtk-3.0/bookmarks b/qusal/dotfiles/files/gtk/.config/gtk-3.0/bookmarks index 010e834..4ba6b95 100644 --- a/qusal/dotfiles/files/gtk/.config/gtk-3.0/bookmarks +++ b/qusal/dotfiles/files/gtk/.config/gtk-3.0/bookmarks @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + file:///home/user/QubesIncoming diff --git a/qusal/dotfiles/files/gtk/.config/gtk-3.0/qubes-incoming-bookmark-created b/qusal/dotfiles/files/gtk/.config/gtk-3.0/qubes-incoming-bookmark-created index e69de29..a513909 100644 --- a/qusal/dotfiles/files/gtk/.config/gtk-3.0/qubes-incoming-bookmark-created +++ b/qusal/dotfiles/files/gtk/.config/gtk-3.0/qubes-incoming-bookmark-created @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/qusal/dotfiles/files/gtk/.config/gtk-3.0/settings.ini b/qusal/dotfiles/files/gtk/.config/gtk-3.0/settings.ini index cafc62d..80ff3b1 100644 --- a/qusal/dotfiles/files/gtk/.config/gtk-3.0/settings.ini +++ b/qusal/dotfiles/files/gtk/.config/gtk-3.0/settings.ini @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Settings] gtk-theme-name=Adwaita-Dark gtk-icon-theme-name=Adwaita diff --git a/qusal/dotfiles/files/gtk/.config/gtk-4.0/bookmarks b/qusal/dotfiles/files/gtk/.config/gtk-4.0/bookmarks index 010e834..4ba6b95 100644 --- a/qusal/dotfiles/files/gtk/.config/gtk-4.0/bookmarks +++ b/qusal/dotfiles/files/gtk/.config/gtk-4.0/bookmarks @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + file:///home/user/QubesIncoming diff --git a/qusal/dotfiles/files/gtk/.config/gtk-4.0/settings.ini b/qusal/dotfiles/files/gtk/.config/gtk-4.0/settings.ini index cafc62d..80ff3b1 100644 --- a/qusal/dotfiles/files/gtk/.config/gtk-4.0/settings.ini +++ b/qusal/dotfiles/files/gtk/.config/gtk-4.0/settings.ini @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Settings] gtk-theme-name=Adwaita-Dark gtk-icon-theme-name=Adwaita diff --git a/qusal/dotfiles/files/net/.config/curl/curlrc b/qusal/dotfiles/files/net/.config/curl/curlrc index 1bfc5d9..1a3b3f4 100644 --- a/qusal/dotfiles/files/net/.config/curl/curlrc +++ b/qusal/dotfiles/files/net/.config/curl/curlrc @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + show-error diff --git a/qusal/dotfiles/files/net/.config/urlview/urlview b/qusal/dotfiles/files/net/.config/urlview/urlview index 287fda0..1f65147 100644 --- a/qusal/dotfiles/files/net/.config/urlview/urlview +++ b/qusal/dotfiles/files/net/.config/urlview/urlview @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + REGEXP \b(((https?|ftp|gopher)|mailto):(//)?[^ <>"\t]*|(www|ftp)[0-9]?\.[-a-z0-9.]+)[^ .,;\t\n\r<">\):]?[^, <>"\t]*[^] .,;\t\n\r<">\):] diff --git a/qusal/dotfiles/files/net/.config/wget/wgetrc b/qusal/dotfiles/files/net/.config/wget/wgetrc index 4fd7999..c85b464 100644 --- a/qusal/dotfiles/files/net/.config/wget/wgetrc +++ b/qusal/dotfiles/files/net/.config/wget/wgetrc @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + hsts-file=~/.cache/wget-hsts diff --git a/qusal/dotfiles/files/net/.w3m/keymap b/qusal/dotfiles/files/net/.w3m/keymap index f5dca55..137aa69 100644 --- a/qusal/dotfiles/files/net/.w3m/keymap +++ b/qusal/dotfiles/files/net/.w3m/keymap @@ -1,5 +1,9 @@ +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-only + ## w3m vim-like keymap file -## https://github.com/sansna/keymap.w3m/blob/master/keymap.w3m +## Credits: https://github.com/sansna/keymap.w3m/blob/master/keymap.w3m ########## invalidate defaults ########## keymap K NULL diff --git a/qusal/dotfiles/files/pgp/.gnupg/gpg.conf b/qusal/dotfiles/files/pgp/.gnupg/gpg.conf index b9930d4..e6e268e 100644 --- a/qusal/dotfiles/files/pgp/.gnupg/gpg.conf +++ b/qusal/dotfiles/files/pgp/.gnupg/gpg.conf @@ -1,16 +1,23 @@ -## Based on https://github.com/Whonix/anon-apps-config -no-emit-version -no-comments -display-charset utf-8 +## SPDX-FileCopyrightText: 2012 - 2013 Jacob Appelbaum +## SPDX-FileCopyrightText: 2012 - 2013 Sukhbir Singh +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: BSD-2-Clause + +## Credits: https://github.com/ioerror/torbirdy/blob/master/gpg.conf + +## Algo personal-digest-preferences SHA512 cert-digest-algo SHA512 -default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed -keyserver-options no-honor-keyserver-url -fixed-list-mode -keyid-format 0xlong -use-agent -verify-options show-uid-validity +default-preference-list SHA512 SHA384 SHA256 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed + +## Show +display-charset utf-8 +keyid-format long list-options show-uid-validity +no-comments +verify-options show-uid-validity with-fingerprint -sig-notation issuer-fpr@notations.openpgp.fifthhorseman.net=%g -## vim: set ft=gpg +with-subkey-fingerprint + +## vim: ft=gpg diff --git a/qusal/dotfiles/files/qvm-copy-dotfiles b/qusal/dotfiles/files/qvm-copy-dotfiles index 8e81634..626f9b1 100755 --- a/qusal/dotfiles/files/qvm-copy-dotfiles +++ b/qusal/dotfiles/files/qvm-copy-dotfiles @@ -1,5 +1,9 @@ #!/bin/sh ## +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later +## ## Benefits of this method: ## - faster than salt, no need for a dispvm. ## - preserve permisions, salt-ssh doesnt. diff --git a/qusal/dotfiles/files/setup.sh b/qusal/dotfiles/files/setup.sh index 161fcc8..13e8b99 100755 --- a/qusal/dotfiles/files/setup.sh +++ b/qusal/dotfiles/files/setup.sh @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + set -eu prg="$0" diff --git a/qusal/dotfiles/files/sh/.config/bash/bash_env b/qusal/dotfiles/files/sh/.config/bash/bash_env index c613826..159e87c 100644 --- a/qusal/dotfiles/files/sh/.config/bash/bash_env +++ b/qusal/dotfiles/files/sh/.config/bash/bash_env @@ -1,4 +1,10 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2004 - 2022 Tim Pope +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC1090,SC1091 if test -z "$ENV" && test -n "$PATH"; then diff --git a/qusal/dotfiles/files/sh/.config/bash/bash_logout b/qusal/dotfiles/files/sh/.config/bash/bash_logout index 7b134f7..3d1b800 100644 --- a/qusal/dotfiles/files/sh/.config/bash/bash_logout +++ b/qusal/dotfiles/files/sh/.config/bash/bash_logout @@ -1,3 +1,9 @@ #!/usr/bin/env bash + +## SPDX-FileCopyrightText: 2004 - 2022 Tim Pope +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + test "0${SHLVL-}" -le 1 && test -z "${SSH_TTY-}" && test "${TERM-}" = linux && clear diff --git a/qusal/dotfiles/files/sh/.config/bash/bash_profile b/qusal/dotfiles/files/sh/.config/bash/bash_profile index 19b59a9..dc18d17 100644 --- a/qusal/dotfiles/files/sh/.config/bash/bash_profile +++ b/qusal/dotfiles/files/sh/.config/bash/bash_profile @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC1090,1091 . "$HOME/.profile" diff --git a/qusal/dotfiles/files/sh/.config/bash/bashrc b/qusal/dotfiles/files/sh/.config/bash/bashrc index fce396a..99440ca 100644 --- a/qusal/dotfiles/files/sh/.config/bash/bashrc +++ b/qusal/dotfiles/files/sh/.config/bash/bashrc @@ -1,5 +1,9 @@ #!/usr/bin/env bash +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + ## {{{ Requirements ## If not running interactively, return. case $- in diff --git a/qusal/dotfiles/files/sh/.config/bash/inputrc b/qusal/dotfiles/files/sh/.config/bash/inputrc index 674d9ea..a232e7e 100644 --- a/qusal/dotfiles/files/sh/.config/bash/inputrc +++ b/qusal/dotfiles/files/sh/.config/bash/inputrc @@ -1,4 +1,9 @@ # inputrc + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + $include /etc/inputrc ## Options diff --git a/qusal/dotfiles/files/sh/.config/dircolors/dircolors b/qusal/dotfiles/files/sh/.config/dircolors/dircolors index 25e5e9e..f4f010f 100644 --- a/qusal/dotfiles/files/sh/.config/dircolors/dircolors +++ b/qusal/dotfiles/files/sh/.config/dircolors/dircolors @@ -1,4 +1,10 @@ # dircolors + +## SPDX-FileCopyrightText: 2004 - 2022 Tim Pope +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # Credits: https://github.com/tpope/dotfiles/blob/master/.dir_colors # vim: set ft=dircolors diff --git a/qusal/dotfiles/files/sh/.config/less/lessfilter b/qusal/dotfiles/files/sh/.config/less/lessfilter index 12465e2..f8fa6b4 100755 --- a/qusal/dotfiles/files/sh/.config/less/lessfilter +++ b/qusal/dotfiles/files/sh/.config/less/lessfilter @@ -1,12 +1,19 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2004 - 2022 Tim Pope +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + ## Credits: https://github.com/tpope/dotfiles/blob/master/.lessfilter + set -eu if test -d "$1"; then exec ls -lF "$1" else case $1 in - *.json) has jq && exec jq -C . "$1";; + *.json) command -v jq >/dev/null && exec jq -C . "$1";; esac fi diff --git a/qusal/dotfiles/files/sh/.config/less/lesskey b/qusal/dotfiles/files/sh/.config/less/lesskey index 6df7e1a..11c0191 100644 --- a/qusal/dotfiles/files/sh/.config/less/lesskey +++ b/qusal/dotfiles/files/sh/.config/less/lesskey @@ -1,3 +1,7 @@ +## SPDX-FileCopyrightText: 2013 - 2016 Tim Pope +## +## SPDX-License-Identifier: GPL-3.0-or-later + ## Credits: https://github.com/tpope/dotfiles/blob/master/.lesskey #command h left-scroll diff --git a/qusal/dotfiles/files/sh/.config/sh/profile b/qusal/dotfiles/files/sh/.config/sh/profile index 0b853fd..3365751 100644 --- a/qusal/dotfiles/files/sh/.config/sh/profile +++ b/qusal/dotfiles/files/sh/.config/sh/profile @@ -1,5 +1,9 @@ #!/bin/sh +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + ## Not so invasive because it only assigns a value if it is empty. : "${HOME:=$(cd ~ && pwd)}" : "${USER:=$(id -un || printf %s "${HOME##*/}")}" diff --git a/qusal/dotfiles/files/sh/.config/sh/shrc b/qusal/dotfiles/files/sh/.config/sh/shrc index 1a688d2..1adffff 100644 --- a/qusal/dotfiles/files/sh/.config/sh/shrc +++ b/qusal/dotfiles/files/sh/.config/sh/shrc @@ -1,4 +1,10 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2004 - 2022 Tim Pope +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + ## Credits: https://github.com/tpope/dotfiles/blob/master/.shrc ## {{{ Requirements @@ -53,14 +59,6 @@ alias reload='. $ENV' r="reload" alias reload-xprofile='. $XDG_CONFIG_HOME/x11/xprofile' rx="reload-xprofile" ## POSIX cd does not allow '--' and other shells breaks when not using it. alias -- -="cd -" 2>/dev/null || true -up(){ - ## Credits: https://stackoverflow.com/a/26134858 - case "${1-}" in - [1-9]) cd "$(printf "%0.0s../" $(seq 1 "$1"))" || return;; - "") cd .. || return;; - *) cd "$(pwd | sed -r "s|(.*/$1[^/]*/).*|\1|")" || return - esac -} test -n "$EDITOR" && alias e='$EDITOR' test -n "$VISUAL" && alias v='$VISUAL' alias j="jobs" diff --git a/qusal/dotfiles/files/sh/.config/user-dirs.dirs b/qusal/dotfiles/files/sh/.config/user-dirs.dirs index ef51449..426a08b 100644 --- a/qusal/dotfiles/files/sh/.config/user-dirs.dirs +++ b/qusal/dotfiles/files/sh/.config/user-dirs.dirs @@ -1,3 +1,7 @@ +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # This file is written by xdg-user-dirs-update # If you want to change or add directories, just edit the line you're # interested in. All local changes will be retained on the next run. diff --git a/qusal/dotfiles/files/sh/.config/user-dirs.locale b/qusal/dotfiles/files/sh/.config/user-dirs.locale index 3e0b419..1ee4843 100644 --- a/qusal/dotfiles/files/sh/.config/user-dirs.locale +++ b/qusal/dotfiles/files/sh/.config/user-dirs.locale @@ -1 +1,5 @@ -en_US \ No newline at end of file +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + +en_US diff --git a/qusal/dotfiles/files/sh/.config/zsh/zlogout b/qusal/dotfiles/files/sh/.config/zsh/zlogout index 6df431a..e2c2f9f 100644 --- a/qusal/dotfiles/files/sh/.config/zsh/zlogout +++ b/qusal/dotfiles/files/sh/.config/zsh/zlogout @@ -1,3 +1,9 @@ #!/usr/bin/env zsh + +## SPDX-FileCopyrightText: 2004 - 2022 Tim Pope +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + test "0${SHLVL-}" -le 1 && test -z "${SSH_TTY-}" && test "${TERM-}" = linux && clear diff --git a/qusal/dotfiles/files/sh/.config/zsh/zprofile b/qusal/dotfiles/files/sh/.config/zsh/zprofile index 1c2a27b..f768762 100644 --- a/qusal/dotfiles/files/sh/.config/zsh/zprofile +++ b/qusal/dotfiles/files/sh/.config/zsh/zprofile @@ -1,4 +1,9 @@ #!/usr/bin/env zsh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + ## Zsh does not source /etc/profile as it is not a Bourne based Shell, but ## some distributions such as Qubes, Whonix, Debian, Gentoo ship files to ## /etc/profile.d. diff --git a/qusal/dotfiles/files/sh/.config/zsh/zshenv b/qusal/dotfiles/files/sh/.config/zsh/zshenv index 58620c6..0d5f3e2 100644 --- a/qusal/dotfiles/files/sh/.config/zsh/zshenv +++ b/qusal/dotfiles/files/sh/.config/zsh/zshenv @@ -1,5 +1,9 @@ #!/usr/bin/env zsh +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + if test -z "$ENV" && test -n "$PATH"; then case $- in *l*) ;; diff --git a/qusal/dotfiles/files/sh/.config/zsh/zshrc b/qusal/dotfiles/files/sh/.config/zsh/zshrc index b013753..37fdf00 100644 --- a/qusal/dotfiles/files/sh/.config/zsh/zshrc +++ b/qusal/dotfiles/files/sh/.config/zsh/zshrc @@ -1,5 +1,12 @@ #!/usr/bin/env zsh +## SPDX-FileCopyrightText: 2004 - 2022 Tim Pope +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + +## Credits: https://github.com/tpope/dotfiles/blob/master/.zshrc + ## {{{ Requirements ## If not running interactively, return. case $- in @@ -39,7 +46,6 @@ zle -N bracketed-paste bracketed-paste-magic autoload -Uz url-quote-magic zle -N self-insert url-quote-magic -# https://github.com/zsh-users/zsh-autosuggestions/issues/511#issuecomment-962671126 pasteinit() { OLD_SELF_INSERT=${${(s.:.)widgets[self-insert]}[2,3]} zle -N self-insert url-quote-magic @@ -54,7 +60,6 @@ zstyle :bracketed-paste-magic paste-finish pastefinish alias reload="exec zsh" ## }}} ## {{{ Prompt -## https://github.com/zsh-users/zsh/blob/master/Functions/Misc/colors autoload -U colors && colors [[ "${COLORTERM-}" == (24bit|truecolor) || "${terminfo[colors]}" -eq '16777216' ]] || zmodload zsh/nearcolor @@ -68,7 +73,6 @@ else fi ## Set window title -## Credits: https://github.com/tpope/dotfiles/blob/master/.zshrc _set_title() { case "${1:-}" in *install*) diff --git a/qusal/dotfiles/files/ssh/.ssh/config b/qusal/dotfiles/files/ssh/.ssh/config index 3e8276b..f915448 100644 --- a/qusal/dotfiles/files/ssh/.ssh/config +++ b/qusal/dotfiles/files/ssh/.ssh/config @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + Host * ## Distrust the remote ForwardX11 no diff --git a/qusal/dotfiles/files/tmux/.config/tmux/tmux.conf b/qusal/dotfiles/files/tmux/.config/tmux/tmux.conf index a85bc19..5653a76 100644 --- a/qusal/dotfiles/files/tmux/.config/tmux/tmux.conf +++ b/qusal/dotfiles/files/tmux/.config/tmux/tmux.conf @@ -1,5 +1,8 @@ ## tmux.conf -## vim:set foldmethod=expr foldexpr=getline(v\:lnum)=~'^#!'?'>1'\:'=': + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later #! {{{ Options ## Usage @@ -135,3 +138,5 @@ set -g @suspend_key 'F12' if-shell 'test -f "$HOME/.tmux.conf.local"' 'tmux source "$HOME/.tmux.conf.local"' run-shell 'command -v tmux-sorcerer >/dev/null && tmux-sorcerer ~/.config/tmux/plugins ~/src/tmux/plugins' ## }}} + +## vim:set foldmethod=expr foldexpr=getline(v\:lnum)=~'^#!'?'>1'\:'=': diff --git a/qusal/dotfiles/files/vim/.config/vim/after/autoload/pathogen.vim b/qusal/dotfiles/files/vim/.config/vim/after/autoload/pathogen.vim index 59a75c1..0744105 100644 --- a/qusal/dotfiles/files/vim/.config/vim/after/autoload/pathogen.vim +++ b/qusal/dotfiles/files/vim/.config/vim/after/autoload/pathogen.vim @@ -1,6 +1,8 @@ " pathogen.vim - path option manipulation " Maintainer: Tim Pope " Version: 2.4 +" SPDX-FileCopyrightText: 2022 Tim Pope +" SPDX-License-Identifier: Vim " Install in ~/.vim/autoload (or ~\vimfiles\autoload). " diff --git a/qusal/dotfiles/files/vim/.config/vim/after/colors/tango2.vim b/qusal/dotfiles/files/vim/.config/vim/after/colors/tango2.vim index 330fe89..be745ed 100644 --- a/qusal/dotfiles/files/vim/.config/vim/after/colors/tango2.vim +++ b/qusal/dotfiles/files/vim/.config/vim/after/colors/tango2.vim @@ -3,6 +3,8 @@ " Purpose: Another colour scheme using the Tango colour palette " Maintainer: Pranesh Srinivasan " Last Modified: Saturday 04 October 2008 02:06:26 AM IST +" SPDX-FileCopyrightText: 2008 Pranesh Srinivasan +" SPDX-License-Identifier: Vim " ============================================================================= " Inspired from some Gnome renditions of the Tango colour scheme. @@ -38,24 +40,24 @@ endif " General colours " ============================================================================= -hi Normal guibg=#2E3436 guifg=#eeeeec +hi Normal guibg=#2E3436 guifg=#eeeeec hi Cursor gui=none guibg=White guifg=Black hi Folded guibg=#4D585B guibg=#d2d2d2 -" No fold column support yet +" No fold column support yet " hi FoldColumn guifg=Orange guibg=DarkBlue " ============================================================================= " Syntax highlighting " ============================================================================= hi Comment gui=italic guifg=#6d7e8a ctermfg=Grey -hi Todo term=bold guifg=#EBC450 +hi Todo term=bold guifg=#EBC450 hi Constant guifg=#8ae234 hi Type guifg=#8AE234 hi Function gui=bold guifg=#9BCF8D hi Statement guifg=#729FCF hi Identifier guifg=#AD7FA8 -hi PreProc guifg=#e9ba6e +hi PreProc guifg=#e9ba6e hi Special term=underline guifg=#5EAFE5 hi Search guibg=#81ABBD diff --git a/qusal/dotfiles/files/vim/.config/vim/after/colors/torte.vim b/qusal/dotfiles/files/vim/.config/vim/after/colors/torte.vim index f28ed60..8ad281d 100644 --- a/qusal/dotfiles/files/vim/.config/vim/after/colors/torte.vim +++ b/qusal/dotfiles/files/vim/.config/vim/after/colors/torte.vim @@ -4,6 +4,8 @@ " grey on black " optimized for TFT panels " $Revision: 1.1 $ +" SPDX-FileCopyrightText: 2001 Thorsten Maerz +" SPDX-License-Identifier: Vim set background=dark hi clear @@ -48,4 +50,3 @@ if has("unix") highlight Comment ctermfg=Cyan cterm=NONE guifg=LightBlue gui=NONE endif endif - diff --git a/qusal/dotfiles/files/vim/.config/vim/after/colors/vividchalk.vim b/qusal/dotfiles/files/vim/.config/vim/after/colors/vividchalk.vim index 72ea0ed..df92f27 100644 --- a/qusal/dotfiles/files/vim/.config/vim/after/colors/vividchalk.vim +++ b/qusal/dotfiles/files/vim/.config/vim/after/colors/vividchalk.vim @@ -3,6 +3,8 @@ " Author: Tim Pope " Version: 2.0 " GetLatestVimScripts: 1891 1 :AutoInstall: vividchalk.vim +" SPDX-FileCopyrightText: 2023 Tim Pope +" SPDX-License-Identifier: Vim " Based on the Vibrank Ink theme for TextMate " Distributable under the same terms as Vim itself (see :help license) diff --git a/qusal/dotfiles/files/vim/.config/vim/after/ftdetect/.gitignore b/qusal/dotfiles/files/vim/.config/vim/after/ftdetect/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/qusal/dotfiles/files/vim/.config/vim/after/ftplugin/markdown.vim b/qusal/dotfiles/files/vim/.config/vim/after/ftplugin/markdown.vim index 45dffbc..5ae43a3 100644 --- a/qusal/dotfiles/files/vim/.config/vim/after/ftplugin/markdown.vim +++ b/qusal/dotfiles/files/vim/.config/vim/after/ftplugin/markdown.vim @@ -1,5 +1,8 @@ -" Author: Maxim Kim -" Source: https://vi.stackexchange.com/a/21689 +" Author: Maxim Kim +" Credits: https://vi.stackexchange.com/a/21689 +" SPDX-FileCopyrightText: 2021 Maxim Kim +" SPDX-License-Identifier: Vim + function! MarkdownFold() let line = getline(v:lnum) diff --git a/qusal/dotfiles/files/vim/.config/vim/after/indent/.gitignore b/qusal/dotfiles/files/vim/.config/vim/after/indent/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/qusal/dotfiles/files/vim/.config/vim/after/macros/less.vim b/qusal/dotfiles/files/vim/.config/vim/after/macros/less.vim index 2dd572d..70d91da 100644 --- a/qusal/dotfiles/files/vim/.config/vim/after/macros/less.vim +++ b/qusal/dotfiles/files/vim/.config/vim/after/macros/less.vim @@ -1,2 +1,4 @@ +" SPDX-FileCopyrightText: 2023 Tim Pope +" SPDX-License-Identifier: Vim set cmdheight=1 set laststatus=0 diff --git a/qusal/dotfiles/files/vim/.config/vim/after/plugin/cool.vim b/qusal/dotfiles/files/vim/.config/vim/after/plugin/cool.vim index 6c78120..7326065 100644 --- a/qusal/dotfiles/files/vim/.config/vim/after/plugin/cool.vim +++ b/qusal/dotfiles/files/vim/.config/vim/after/plugin/cool.vim @@ -1,9 +1,11 @@ " vim-cool - Disable hlsearch when you are done searching. -" Maintainer: romainl -" Version: 0.0.2 -" License: MIT License -" Location: plugin/cool.vim -" Website: https://github.com/romainl/vim-cool +" Maintainer: romainl +" Version: 0.0.2 +" License: Vim +" Location: plugin/cool.vim +" Website: https://github.com/romainl/vim-cool +" SPDX-FileCopyrightText: 2023 romainl +" SPDX-License-Identifier: Vim if exists("g:loaded_cool") || v:version < 704 || &compatible finish diff --git a/qusal/dotfiles/files/vim/.config/vim/after/plugin/lastplace.vim b/qusal/dotfiles/files/vim/.config/vim/after/plugin/lastplace.vim index 51f0575..4a03e2d 100644 --- a/qusal/dotfiles/files/vim/.config/vim/after/plugin/lastplace.vim +++ b/qusal/dotfiles/files/vim/.config/vim/after/plugin/lastplace.vim @@ -5,6 +5,8 @@ " Licence: MIT " Website: http://www.gregd.org/ " Version: 3.0.0 +" SPDX-FileCopyrightText: 2023 Greg Dietsche +" SPDX-License-Identifier: Vim " ============================================================================ if exists("b:loaded_lastplace_plugin") || &cp diff --git a/qusal/dotfiles/files/vim/.config/vim/after/plugin/update-time.vim b/qusal/dotfiles/files/vim/.config/vim/after/plugin/update-time.vim index a4a5c07..8d9d984 100644 --- a/qusal/dotfiles/files/vim/.config/vim/after/plugin/update-time.vim +++ b/qusal/dotfiles/files/vim/.config/vim/after/plugin/update-time.vim @@ -1,8 +1,10 @@ " File: update-time.vim " Author: QianChenglong " Create Time: 2013-12-04 19:36:21 CST -" Last Change: 2023 May 04 +" Last Change: 2023 Oct 21 " Description: Automatic update Last Change time +" SPDX-FileCopyrightText: 2013 QianChenglong +" SPDX-License-Identifier: Vim if exists("g:loaded_update_time") finish diff --git a/qusal/dotfiles/files/vim/.config/vim/after/syntax/.gitignore b/qusal/dotfiles/files/vim/.config/vim/after/syntax/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftdetect/jinja.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftdetect/jinja.vim index 994c80e..7ebeb10 100644 --- a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftdetect/jinja.vim +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftdetect/jinja.vim @@ -1,4 +1,7 @@ -" Source: https://github.com/lepture/vim-jinja/blob/master/ftdetect/jinja.vim +" Credits: https://github.com/lepture/vim-jinja/blob/master/ftdetect/jinja.vim +" SPDX-FileCopyrightText: 2020 Lepture +" SPDX-License-Identifier: Vim + " Figure out which type of hilighting to use for html. function! s:SelectHTML() let n = 1 diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftplugin/jinja.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftplugin/jinja.vim index 624d26b..8b46fce 100644 --- a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftplugin/jinja.vim +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/ftplugin/jinja.vim @@ -1,4 +1,6 @@ -" Source: https://github.com/Glench/Vim-Jinja2-Syntax/blob/master/ftplugin/jinja.vim +" Credits: https://github.com/Glench/Vim-Jinja2-Syntax/blob/master/ftplugin/jinja.vim +" SPDX-FileCopyrightText: 2020 Glench +" SPDX-License-Identifier: Vim if exists('b:did_ftplugin') finish diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/syntax/jinja.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/syntax/jinja.vim index a371d0b..effee1e 100644 --- a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/syntax/jinja.vim +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-jinja/syntax/jinja.vim @@ -1,9 +1,11 @@ " Vim syntax file " Language: Jinja template " Maintainer: Armin Ronacher -" Last Change: 2023 May 16 +" Last Change: 2023 Oct 21 " Version: 1.1 -" Source: https://github.com/Glench/Vim-Jinja2-Syntax/blob/master/syntax/jinja.vim +" Credits: https://github.com/Glench/Vim-Jinja2-Syntax/blob/master/syntax/jinja.vim +" SPDX-FileCopyrightText: 2020 Armin Ronacher +" SPDX-License-Identifier: Vim if exists("b:current_syntax") finish diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftdetect/salt.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftdetect/salt.vim index 02f7243..8ec50cd 100644 --- a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftdetect/salt.vim +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftdetect/salt.vim @@ -1,4 +1,7 @@ -" Source: https://github.com/vmware-archive/salt-vim/blob/master/ftdetect/sls.vim +" Credits: https://github.com/vmware-archive/salt-vim/blob/master/ftdetect/sls.vim +" SPDX-FileCopyrightText: 2020 Seth House +" SPDX-License-Identifier: Vim + function! DetectSalt() if !did_filetype() if match(getline(1), '^#!py') > -1 diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftplugin/salt.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftplugin/salt.vim index 65aa9f1..bbec2e2 100644 --- a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftplugin/salt.vim +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/ftplugin/salt.vim @@ -1,7 +1,9 @@ " Vim filetype plugin file " Language: YAML (YAML Ain't Markup Language) " Previous Maintainer: Nikolai Weibull (inactive) -" Last Change: 2023 May 03 +" Last Change: 2023 Oct 21 +" SPDX-FileCopyrightText: 2020 Nikolai Weibull +" SPDX-License-Identifier: Vim if exists("b:did_ftplugin") finish diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/indent/salt.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/indent/salt.vim index 8dca5cd..e0c2250 100644 --- a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/indent/salt.vim +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/indent/salt.vim @@ -3,6 +3,8 @@ " Maintainer: Nikolai Pavlov " Last Update: Lukas Reineke " Last Change: 2021 Jan 19 +" SPDX-FileCopyrightText: 2021 Nikolai Pavlov +" SPDX-License-Identifier: Vim " Only load this indent file when no other was loaded. if exists('b:did_indent') @@ -125,7 +127,7 @@ function GetYAMLIndent(lnum) let qidx = match(prevline, '\v\"%([^"\\]|\\.)*\\') return virtcol([prevlnum, qidx+1]) elseif line =~# s:liststartregex - " List line should have indent equal to previous list line unless it was + " List line should have indent equal to previous list line unless it was " caught by one of the previous rules return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum, \ s:liststartregex)) diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/syntax/salt.vim b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/syntax/salt.vim index d6b5593..288994b 100644 --- a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/syntax/salt.vim +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/syntax/salt.vim @@ -1,8 +1,10 @@ " Vim syntax file " Language: Salt States template " Maintainer: Seth House -" Last Change: 2023 Apr 17 -" Source: https://github.com/vmware-archive/salt-vim/blob/master/syntax/sls.vim +" Last Change: 2023 Oct 21 +" Credits: https://github.com/vmware-archive/salt-vim/blob/master/syntax/sls.vim +" SPDX-FileCopyrightText: 2020 Seth House +" SPDX-License-Identifier: Vim if exists("b:current_syntax") finish diff --git a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/test/file.sls b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/test/file.sls index daa15fb..3ec2629 100644 --- a/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/test/file.sls +++ b/qusal/dotfiles/files/vim/.config/vim/bundle/vim-salt/test/file.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: Vim +#} + {%- import "path/to/file.jinja" as tpl -%} include: diff --git a/qusal/dotfiles/files/vim/.config/vim/vimrc b/qusal/dotfiles/files/vim/.config/vim/vimrc index d84155c..55d6e2d 100644 --- a/qusal/dotfiles/files/vim/.config/vim/vimrc +++ b/qusal/dotfiles/files/vim/.config/vim/vimrc @@ -1,3 +1,8 @@ +" SPDX-FileCopyrightText: 2004 - 2023 Tim Pope +" SPDX-FileCopyrightText: 2023 Qusal contributors +" +" SPDX-License-Identifier: Vim +" " Credits: https://github.com/tpope/dotfiles/blob/master/.vimrc " Section: Bootstrap diff --git a/qusal/dotfiles/files/x11/.config/x11/xinitrc b/qusal/dotfiles/files/x11/.config/x11/xinitrc index f88e2e4..3252385 100755 --- a/qusal/dotfiles/files/x11/.config/x11/xinitrc +++ b/qusal/dotfiles/files/x11/.config/x11/xinitrc @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC1090,SC1091 test -r "$HOME/.profile" && . "$HOME/.profile" . "${XDG_CONFIG_HOME:=$HOME/.config}/x11/xprofile" diff --git a/qusal/dotfiles/files/x11/.config/x11/xprofile b/qusal/dotfiles/files/x11/.config/x11/xprofile index c29c55f..273d52a 100755 --- a/qusal/dotfiles/files/x11/.config/x11/xprofile +++ b/qusal/dotfiles/files/x11/.config/x11/xprofile @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC1090,SC1091 ## Sourced by display manager, xinit and startx. diff --git a/qusal/dotfiles/files/x11/.config/x11/xresources b/qusal/dotfiles/files/x11/.config/x11/xresources index 91883d6..f760580 100644 --- a/qusal/dotfiles/files/x11/.config/x11/xresources +++ b/qusal/dotfiles/files/x11/.config/x11/xresources @@ -1,5 +1,11 @@ ! ~/.Xresources -! Credits: Tpope: https://github.com/tpope/dotfiles/blob/master/.Xresources + +! SPDX-FileCopyrightText: 2004 - 2016 Tim Pope +! SPDX-FileCopyrightText: 2023 Qusal contributors +! +! SPDX-License-Identifier: GPL-3.0-or-later + +! Credits: https://github.com/tpope/dotfiles/blob/master/.Xresources ! vim:set foldmethod=expr foldexpr=getline(v\:lnum)=~'^!##'?'>1'\:'=': *international: true diff --git a/qusal/dotfiles/files/x11/.config/x11/xsession b/qusal/dotfiles/files/x11/.config/x11/xsession index f88e2e4..3252385 100755 --- a/qusal/dotfiles/files/x11/.config/x11/xsession +++ b/qusal/dotfiles/files/x11/.config/x11/xsession @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC1090,SC1091 test -r "$HOME/.profile" && . "$HOME/.profile" . "${XDG_CONFIG_HOME:=$HOME/.config}/x11/xprofile" diff --git a/qusal/dotfiles/files/x11/.config/x11/xsessionrc b/qusal/dotfiles/files/x11/.config/x11/xsessionrc index e542955..b2ec69f 100755 --- a/qusal/dotfiles/files/x11/.config/x11/xsessionrc +++ b/qusal/dotfiles/files/x11/.config/x11/xsessionrc @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC1090,SC1091 test -r "$HOME/.profile" && . "$HOME/.profile" . "${XDG_CONFIG_HOME:=$HOME/.config}/x11/xsession" diff --git a/qusal/fedora-minimal/README.md b/qusal/fedora-minimal/README.md new file mode 100644 index 0000000..0535243 --- /dev/null +++ b/qusal/fedora-minimal/README.md @@ -0,0 +1,24 @@ +# fedora-minimal + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) + +## Description + +Download and configure the Fedora Minimal Template. + +## Installation + +- Top: +```sh +qubesctl top.enable fedora-minimal +qubesctl --targets=fedora-38-minimal state.apply +qubesctl top.disable fedora-minimal +``` +- State: +```sh +qubesctl state.apply fedora-minimal.create +qubesctl --skip-dom0 --targets=fedora-38-minimal state.apply fedora-minimal.install +``` diff --git a/qusal/fedora-minimal/clone.sls b/qusal/fedora-minimal/clone.sls new file mode 100644 index 0000000..8a9c05e --- /dev/null +++ b/qusal/fedora-minimal/clone.sls @@ -0,0 +1,12 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import slsdotpath ~ "/template.jinja" as template -%} + +"{{ template.template }}-template-installed": + qvm.template_installed: + - name: {{ template.template }} + - fromrepo: {{ template.repo }} diff --git a/qusal/fedora-minimal/clone.top b/qusal/fedora-minimal/clone.top new file mode 100644 index 0000000..0c93359 --- /dev/null +++ b/qusal/fedora-minimal/clone.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - fedora-minimal.clone diff --git a/qusal/templates/fedora-minimal/create.sls b/qusal/fedora-minimal/create.sls similarity index 78% rename from qusal/templates/fedora-minimal/create.sls rename to qusal/fedora-minimal/create.sls index c84f31e..2307747 100644 --- a/qusal/templates/fedora-minimal/create.sls +++ b/qusal/fedora-minimal/create.sls @@ -1,13 +1,19 @@ -{%- import "templates/fedora.jinja" as fedora -%} +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import slsdotpath ~ "/template.jinja" as fedora -%} include: - - templates.fedora-minimal.clone + - .clone "{{ template.template_clean }}": qvm.vm: - name: {{ template.template_clean }} - require: - - sls: templates.{{ template.template_clean }}.clone + - sls: {{ template.template_clean }}.clone - present: - label: black - prefs: @@ -47,3 +53,5 @@ include: - features: - enable: - appmenus-dispvm + - set: + - menu-items: "qubes-open-file-manager.desktop qubes-run-terminal.desktop qubes-start.desktop" diff --git a/qusal/fedora-minimal/create.top b/qusal/fedora-minimal/create.top new file mode 100644 index 0000000..5b0ec18 --- /dev/null +++ b/qusal/fedora-minimal/create.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - fedora-minimal.create diff --git a/qusal/fedora-minimal/init.top b/qusal/fedora-minimal/init.top new file mode 100644 index 0000000..ed1d6fb --- /dev/null +++ b/qusal/fedora-minimal/init.top @@ -0,0 +1,13 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - fedora-minimal.create + 'I@qubes:type:template and E@^fedora-[0-9][0-9]-minimal$': + - match: compound + - fedora-minimal.install diff --git a/qusal/templates/fedora-minimal/install.sls b/qusal/fedora-minimal/install.sls similarity index 60% rename from qusal/templates/fedora-minimal/install.sls rename to qusal/fedora-minimal/install.sls index a3e2c06..7fc106e 100644 --- a/qusal/templates/fedora-minimal/install.sls +++ b/qusal/fedora-minimal/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/fedora-minimal/install.top b/qusal/fedora-minimal/install.top new file mode 100644 index 0000000..7e7c112 --- /dev/null +++ b/qusal/fedora-minimal/install.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'I@qubes:type:template and E@^fedora-[0-9][0-9]-minimal$': + - match: compound + - fedora-minimal.install diff --git a/qusal/templates/debian-minimal.jinja b/qusal/fedora-minimal/template.jinja similarity index 57% rename from qusal/templates/debian-minimal.jinja rename to qusal/fedora-minimal/template.jinja index 6656832..550a7f4 100644 --- a/qusal/templates/debian-minimal.jinja +++ b/qusal/fedora-minimal/template.jinja @@ -1,4 +1,10 @@ -{%- import "templates/debian.jinja" as template_base -%} +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import "fedora/template.jinja" as template_base -%} {% set version = template_base.version -%} {% set repo = template_base.repo -%} {% set template = template_base.template ~ '-minimal' -%} diff --git a/qusal/fedora/README.md b/qusal/fedora/README.md new file mode 100644 index 0000000..bb002bb --- /dev/null +++ b/qusal/fedora/README.md @@ -0,0 +1,27 @@ +# fedora + +## Table of Contents + +* [Description](#description) +* [Installation](#installation) + +## Description + +Download and configure the Fedora Template. + +## Installation + +- Top: +```sh +qubesctl top.enable fedora +qubesctl --targets=fedora-38 state.apply +qubesctl top.disable fedora +``` +- State: +```sh +qubesctl state.apply fedora.create +qubesctl --skip-dom0 --targets=fedora-38 state.apply fedora.install +``` + + +SPD-License-Identifier: GPL-3.0-or-later diff --git a/qusal/fedora/clone.sls b/qusal/fedora/clone.sls new file mode 100644 index 0000000..8a9c05e --- /dev/null +++ b/qusal/fedora/clone.sls @@ -0,0 +1,12 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import slsdotpath ~ "/template.jinja" as template -%} + +"{{ template.template }}-template-installed": + qvm.template_installed: + - name: {{ template.template }} + - fromrepo: {{ template.repo }} diff --git a/qusal/fedora/clone.top b/qusal/fedora/clone.top new file mode 100644 index 0000000..4da9fbd --- /dev/null +++ b/qusal/fedora/clone.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - fedora.clone diff --git a/qusal/templates/fedora/create.sls b/qusal/fedora/create.sls similarity index 74% rename from qusal/templates/fedora/create.sls rename to qusal/fedora/create.sls index 5b3c5dc..7bf350f 100644 --- a/qusal/templates/fedora/create.sls +++ b/qusal/fedora/create.sls @@ -1,13 +1,19 @@ -{%- import "templates/fedora.jinja" as template -%} +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import slsdotpath ~ "/template.jinja" as template -%} include: - - templates.{{ template.template_clean }}.clone + - .clone "{{ template.template_clean }}": qvm.vm: - name: {{ template.template_clean }} - require: - - sls: templates.{{ template.template_clean }}.clone + - sls: {{ template.template_clean }}.clone - present: - label: black - prefs: @@ -32,7 +38,7 @@ include: qvm.vm: - name: dvm-{{ template.template_clean }} - require: - - sls: templates.{{ template.template_clean }}.clone + - sls: {{ template.template_clean }}.clone - present: - template: {{ fedora.fedora_template }} - label: red @@ -47,3 +53,5 @@ include: - features: - enable: - appmenus-dispvm + - set: + - menu-items: "qubes-open-file-manager.desktop qubes-run-terminal.desktop qubes-start.desktop" diff --git a/qusal/fedora/create.top b/qusal/fedora/create.top new file mode 100644 index 0000000..b39ac1d --- /dev/null +++ b/qusal/fedora/create.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - fedora.create diff --git a/qusal/fedora/init.top b/qusal/fedora/init.top new file mode 100644 index 0000000..63d3f16 --- /dev/null +++ b/qusal/fedora/init.top @@ -0,0 +1,13 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - fedora.create + 'I@qubes:type:template and E@^fedora-[0-9][0-9]$': + - match: compound + - fedora.install diff --git a/qusal/templates/whonix/install.sls b/qusal/fedora/install.sls similarity index 54% rename from qusal/templates/whonix/install.sls rename to qusal/fedora/install.sls index c1f5dda..c23907c 100644 --- a/qusal/templates/whonix/install.sls +++ b/qusal/fedora/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated": diff --git a/qusal/fedora/install.top b/qusal/fedora/install.top new file mode 100644 index 0000000..2b35aae --- /dev/null +++ b/qusal/fedora/install.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'I@qubes:type:template and E@^fedora-[0-9][0-9]$': + - match: compound + - fedora.install diff --git a/qusal/templates/fedora.jinja b/qusal/fedora/template.jinja similarity index 69% rename from qusal/templates/fedora.jinja rename to qusal/fedora/template.jinja index dd77e2d..35eddfa 100644 --- a/qusal/templates/fedora.jinja +++ b/qusal/fedora/template.jinja @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% set version = salt['pillar.get']('qvm:fedora:version', '38') -%} {% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%} {% set template = 'fedora-' ~ version -%} diff --git a/qusal/media/README.md b/qusal/media/README.md index 797f618..d3ce90a 100644 --- a/qusal/media/README.md +++ b/qusal/media/README.md @@ -4,7 +4,7 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) +* [Credits](#credits) ## Description @@ -29,9 +29,6 @@ qubesctl --skip-dom0 --targets=tpl-media state.apply media.install qubesctl --skip-dom0 --targets=media state.apply media.configure ``` -## Copyright +## Credits -License: GPLv3+ - -Credits: - [Unman](https://github.com/unman/shaker/tree/master/multimedia) diff --git a/qusal/media/clone.sls b/qusal/media/clone.sls index 9995809..9391fbc 100644 --- a/qusal/media/clone.sls +++ b/qusal/media/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/media/clone.top b/qusal/media/clone.top index 473522f..e103bda 100644 --- a/qusal/media/clone.top +++ b/qusal/media/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/media/configure.sls b/qusal/media/configure.sls index 8c4b7cb..d16e087 100644 --- a/qusal/media/configure.sls +++ b/qusal/media/configure.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 - 2023 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-home-config-mimeapps.list": diff --git a/qusal/media/configure.top b/qusal/media/configure.top index 60a57ec..84bc2be 100644 --- a/qusal/media/configure.top +++ b/qusal/media/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'media': - media.configure diff --git a/qusal/media/create.sls b/qusal/media/create.sls index a9f0e0d..71b415c 100644 --- a/qusal/media/create.sls +++ b/qusal/media/create.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 - 2023 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {%- import "templates/debian-minimal.jinja" as template -%} include: diff --git a/qusal/media/create.top b/qusal/media/create.top index 2caae82..8e1cc83 100644 --- a/qusal/media/create.top +++ b/qusal/media/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/media/files/app/mimeapps.list b/qusal/media/files/app/mimeapps.list index e287cf1..e4f5352 100644 --- a/qusal/media/files/app/mimeapps.list +++ b/qusal/media/files/app/mimeapps.list @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Default Applications] application/clarisworks=qvm-open-in-dvm.desktop application/csv=qvm-open-in-dvm.desktop @@ -799,4 +803,3 @@ x-scheme-handler/rtmp=qvm-open-in-dvm.desktop x-scheme-handler/rtp=qvm-open-in-dvm.desktop x-scheme-handler/rtsp=qvm-open-in-dvm.desktop x-scheme-handler/vnd.libreoffice.cmis=qvm-open-in-dvm.desktop - diff --git a/qusal/media/files/disp/mimeapps.list b/qusal/media/files/disp/mimeapps.list index 4693b5c..8c327bc 100644 --- a/qusal/media/files/disp/mimeapps.list +++ b/qusal/media/files/disp/mimeapps.list @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Default Applications] application/pdf=xpdf.desktop application/epub+zip=calibre-ebook-viewer.desktop diff --git a/qusal/media/files/policy/default.policy b/qusal/media/files/policy/default.policy index f7c38ea..e12b6d9 100644 --- a/qusal/media/files/policy/default.policy +++ b/qusal/media/files/policy/default.policy @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. qubes.OpenInVM * {{ sls_path }} @dispvm allow target=disp-{{ sls_path }} diff --git a/qusal/media/init.top b/qusal/media/init.top index 8cb1967..1f315d8 100644 --- a/qusal/media/init.top +++ b/qusal/media/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/media/install.sls b/qusal/media/install.sls index 51b9cbf..0b4f9f7 100644 --- a/qusal/media/install.sls +++ b/qusal/media/install.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 - 2023 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated": diff --git a/qusal/media/install.top b/qusal/media/install.top index d0c2816..867af69 100644 --- a/qusal/media/install.top +++ b/qusal/media/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-media': - media.install diff --git a/qusal/mgmt/README.md b/qusal/mgmt/README.md index 1dbb70f..1da03eb 100644 --- a/qusal/mgmt/README.md +++ b/qusal/mgmt/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -23,6 +22,4 @@ qubesctl --skip-dom0 --targets=tpl-mgmt state.apply mgmt.install qubesctl state.apply mgmt.confirm ``` -## Copyright - -License: GPLv2+ +SPD-License-Identifier: GPL-3.0-or-later diff --git a/qusal/mgmt/clone.sls b/qusal/mgmt/clone.sls index 9995809..9391fbc 100644 --- a/qusal/mgmt/clone.sls +++ b/qusal/mgmt/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/mgmt/clone.top b/qusal/mgmt/clone.top index fe3a692..c2335ab 100644 --- a/qusal/mgmt/clone.top +++ b/qusal/mgmt/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/mgmt/confirm.sls b/qusal/mgmt/confirm.sls index 2f77c56..59378ea 100644 --- a/qusal/mgmt/confirm.sls +++ b/qusal/mgmt/confirm.sls @@ -1,3 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} "{{ slsdotpath }}-set-management_dispvm": cmd.run: diff --git a/qusal/mgmt/confirm.top b/qusal/mgmt/confirm.top index 736375d..f07e5a1 100644 --- a/qusal/mgmt/confirm.top +++ b/qusal/mgmt/confirm.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/mgmt/create.sls b/qusal/mgmt/create.sls index a21487d..f19a65f 100644 --- a/qusal/mgmt/create.sls +++ b/qusal/mgmt/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/mgmt/create.top b/qusal/mgmt/create.top index 5ebc5e3..00a9fac 100644 --- a/qusal/mgmt/create.top +++ b/qusal/mgmt/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/mgmt/init.top b/qusal/mgmt/init.top index ce005a1..a5866ad 100644 --- a/qusal/mgmt/init.top +++ b/qusal/mgmt/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/mgmt/install.sls b/qusal/mgmt/install.sls index 06bebb9..10aa858 100644 --- a/qusal/mgmt/install.sls +++ b/qusal/mgmt/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated": diff --git a/qusal/mgmt/install.top b/qusal/mgmt/install.top index 56f520e..b0637f8 100644 --- a/qusal/mgmt/install.top +++ b/qusal/mgmt/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-mgmt': - mgmt.install diff --git a/qusal/mutt/README.md b/qusal/mutt/README.md index 4b78ce0..f30525b 100644 --- a/qusal/mutt/README.md +++ b/qusal/mutt/README.md @@ -5,7 +5,6 @@ * [Description](#description) * [Installation](#installation) * [Usage](#usage) -* [Copyright](#copyright) ## Description @@ -49,7 +48,3 @@ You can define aliases in `~/.muttrc-aliases.local`. If you want to override any option, put the settings in `~/.muttrc.local`, as this is the last file to be sourced. - -## Copyright - -License: GPLv2+ diff --git a/qusal/mutt/clone.sls b/qusal/mutt/clone.sls index 9995809..9391fbc 100644 --- a/qusal/mutt/clone.sls +++ b/qusal/mutt/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/mutt/clone.top b/qusal/mutt/clone.top index 8b44591..d3caefb 100644 --- a/qusal/mutt/clone.top +++ b/qusal/mutt/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/mutt/configure.sls b/qusal/mutt/configure.sls index 0e0c41f..8a36a1b 100644 --- a/qusal/mutt/configure.sls +++ b/qusal/mutt/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' %} include: diff --git a/qusal/mutt/configure.top b/qusal/mutt/configure.top index 7eff253..708bfa6 100644 --- a/qusal/mutt/configure.top +++ b/qusal/mutt/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'mutt': - match: nodegroup diff --git a/qusal/mutt/create.sls b/qusal/mutt/create.sls index 50d3eea..a122177 100644 --- a/qusal/mutt/create.sls +++ b/qusal/mutt/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/mutt/create.top b/qusal/mutt/create.top index bfa9fe3..f8f0340 100644 --- a/qusal/mutt/create.top +++ b/qusal/mutt/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/mutt/files/mutt/conf.d/bindings.muttrc b/qusal/mutt/files/mutt/conf.d/bindings.muttrc index bae100a..938bdf5 100644 --- a/qusal/mutt/files/mutt/conf.d/bindings.muttrc +++ b/qusal/mutt/files/mutt/conf.d/bindings.muttrc @@ -1,4 +1,10 @@ -## Source: https://github.com/LukeSmithxyz/mutt-wizard/blob/master/share/mutt-wizard.muttrc +# SPDX-FileCopyrightText: 2019-2023 Luke Smith +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + +## Credits: https://github.com/LukeSmithxyz/mutt-wizard/blob/master/share/mutt-wizard.muttrc + bind index,pager i noop bind index,pager g noop bind index \Cf noop diff --git a/qusal/mutt/files/mutt/conf.d/colors.muttrc b/qusal/mutt/files/mutt/conf.d/colors.muttrc index 446df6f..5db709e 100644 --- a/qusal/mutt/files/mutt/conf.d/colors.muttrc +++ b/qusal/mutt/files/mutt/conf.d/colors.muttrc @@ -1,4 +1,10 @@ -## Source: https://raw.githubusercontent.com/LukeSmithxyz/mutt-wizard/master/share/mutt-wizard.muttrc +# SPDX-FileCopyrightText: 2019-2023 Luke Smith +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + +## Credits: https://github.com/LukeSmithxyz/mutt-wizard/blob/master/share/mutt-wizard.muttrc + color body green default "\`[^\`]*\`" # Green text between ` and ` color body brightblue default "^# \.*" # Headings as bold blue color body brightcyan default "^## \.*" # Subheadings as bold cyan diff --git a/qusal/mutt/files/mutt/conf.d/lists.muttrc b/qusal/mutt/files/mutt/conf.d/lists.muttrc index ab288f2..53bcf15 100644 --- a/qusal/mutt/files/mutt/conf.d/lists.muttrc +++ b/qusal/mutt/files/mutt/conf.d/lists.muttrc @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2019 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Lists lists .*@googlegroups\\.com subscribe qubes-(announce|devel)@googlegroups\\.com diff --git a/qusal/mutt/files/mutt/conf.d/mailbox.muttrc b/qusal/mutt/files/mutt/conf.d/mailbox.muttrc index edab2b4..20a50b9 100644 --- a/qusal/mutt/files/mutt/conf.d/mailbox.muttrc +++ b/qusal/mutt/files/mutt/conf.d/mailbox.muttrc @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Misc set mbox_type = Maildir set quit = ask-yes diff --git a/qusal/mutt/files/mutt/conf.d/pgp.muttrc b/qusal/mutt/files/mutt/conf.d/pgp.muttrc index 43bd488..6661da0 100644 --- a/qusal/mutt/files/mutt/conf.d/pgp.muttrc +++ b/qusal/mutt/files/mutt/conf.d/pgp.muttrc @@ -1,4 +1,10 @@ -## Source: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/mutt.md +# SPDX-FileCopyrightText: 2020 The Qubes OS Project +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + +## Credits: https://github.com/Qubes-Community/Contents/blob/master/docs/configuration/mutt.md + ## Hooks send-hook "~A" "set pgp_autoinline=no" send-hook "~t @invisiblethingslab\\.com" "set pgp_autoinline=yes crypt_autoencrypt=yes" diff --git a/qusal/mutt/files/mutt/conf.d/server.muttrc b/qusal/mutt/files/mutt/conf.d/server.muttrc index bd3b029..b42b719 100644 --- a/qusal/mutt/files/mutt/conf.d/server.muttrc +++ b/qusal/mutt/files/mutt/conf.d/server.muttrc @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## IMAP set folder = "imaps://imap.$my_server" set spoolfile = "+INBOX" diff --git a/qusal/mutt/files/mutt/muttrc b/qusal/mutt/files/mutt/muttrc index cbf667c..21854e4 100644 --- a/qusal/mutt/files/mutt/muttrc +++ b/qusal/mutt/files/mutt/muttrc @@ -1,3 +1,7 @@ +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + ## Source configuration cd ~/.config/mutt source ~/.muttrc-credentials.local diff --git a/qusal/mutt/init.top b/qusal/mutt/init.top index 29a5120..be946ea 100644 --- a/qusal/mutt/init.top +++ b/qusal/mutt/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/mutt/install.sls b/qusal/mutt/install.sls index 6e8955f..53e16cf 100644 --- a/qusal/mutt/install.sls +++ b/qusal/mutt/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' %} include: diff --git a/qusal/mutt/install.top b/qusal/mutt/install.top index 9e25210..676912d 100644 --- a/qusal/mutt/install.top +++ b/qusal/mutt/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-mutt': - mutt.install diff --git a/qusal/qubes-builder/README.md b/qusal/qubes-builder/README.md index 4c0b12c..3c5d520 100644 --- a/qusal/qubes-builder/README.md +++ b/qusal/qubes-builder/README.md @@ -6,7 +6,6 @@ * [Installation](#installation) * [Access Control](#access-control) * [Usage](#usage) -* [Copyright](#copyright) ## Description @@ -75,7 +74,3 @@ Setting the Disposable VM to Dom0 works because it will use the There are no further modifications needed to comply with this package. Consult upstream documentation on how to use the Qubes OS Builder. - -## Copyright - -License: GPLv2+ diff --git a/qusal/qubes-builder/clone.sls b/qusal/qubes-builder/clone.sls index 55e4402..8a4ed04 100644 --- a/qusal/qubes-builder/clone.sls +++ b/qusal/qubes-builder/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('fedora-minimal', sls_path) }} diff --git a/qusal/qubes-builder/clone.top b/qusal/qubes-builder/clone.top index a005d5d..e61b16d 100644 --- a/qusal/qubes-builder/clone.top +++ b/qusal/qubes-builder/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/qubes-builder/configure-qubes-executor.sls b/qusal/qubes-builder/configure-qubes-executor.sls index bee21bc..c9ac84c 100644 --- a/qusal/qubes-builder/configure-qubes-executor.sls +++ b/qusal/qubes-builder/configure-qubes-executor.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/qubes-builder/configure-qubes-executor.top b/qusal/qubes-builder/configure-qubes-executor.top index 0c0028d..0c10c7d 100644 --- a/qusal/qubes-builder/configure-qubes-executor.top +++ b/qusal/qubes-builder/configure-qubes-executor.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dvm-qubes-builder': - qubes-builder.configure-qubes-executor diff --git a/qusal/qubes-builder/configure.sls b/qusal/qubes-builder/configure.sls index 0504c9b..701e86c 100644 --- a/qusal/qubes-builder/configure.sls +++ b/qusal/qubes-builder/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/qubes-builder/configure.top b/qusal/qubes-builder/configure.top index 6ba3bed..7ebf8e0 100644 --- a/qusal/qubes-builder/configure.top +++ b/qusal/qubes-builder/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'qubes-builder': - qubes-builder.configure diff --git a/qusal/qubes-builder/create.sls b/qusal/qubes-builder/create.sls index 88360e0..ffcd9ff 100644 --- a/qusal/qubes-builder/create.sls +++ b/qusal/qubes-builder/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/qubes-builder/create.top b/qusal/qubes-builder/create.top index 16751cb..1d3e95f 100644 --- a/qusal/qubes-builder/create.top +++ b/qusal/qubes-builder/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/qubes-builder/files/policy/default.policy b/qusal/qubes-builder/files/policy/default.policy index 6bd68bb..775265c 100644 --- a/qusal/qubes-builder/files/policy/default.policy +++ b/qusal/qubes-builder/files/policy/default.policy @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. qubes.Gpg2 * {{ sls_path }} @default ask target=sys-pgp diff --git a/qusal/qubes-builder/files/qubes-builder/gpg-split-domain b/qusal/qubes-builder/files/qubes-builder/gpg-split-domain index dea2381..2691cca 100644 --- a/qusal/qubes-builder/files/qubes-builder/gpg-split-domain +++ b/qusal/qubes-builder/files/qubes-builder/gpg-split-domain @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + @default diff --git a/qusal/qubes-builder/files/qubes-builder/rpmmacros b/qusal/qubes-builder/files/qubes-builder/rpmmacros index 0270564..493ee66 100644 --- a/qusal/qubes-builder/files/qubes-builder/rpmmacros +++ b/qusal/qubes-builder/files/qubes-builder/rpmmacros @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2019 - 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + %__gpg /usr/bin/qubes-gpg-client-wrapper %__gpg_check_password_cmd %{__gpg} \ diff --git a/qusal/qubes-builder/files/qubes-executor/builder.conf b/qusal/qubes-builder/files/qubes-executor/builder.conf index 7b1285e..e70c8f1 100644 --- a/qusal/qubes-builder/files/qubes-executor/builder.conf +++ b/qusal/qubes-builder/files/qubes-executor/builder.conf @@ -1 +1,7 @@ +# SPDX-FileCopyrightText: 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + binds+=('/builder') + +# vim: ft=bash diff --git a/qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyIn b/qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyIn index 2b7b353..62347a4 100755 --- a/qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyIn +++ b/qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyIn @@ -1,5 +1,9 @@ #!/usr/bin/sh +# SPDX-FileCopyrightText: 2022 - 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + set -e sudo bash -c "mkdir -p /builder/incoming && chown -R user:user /builder" diff --git a/qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyOut b/qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyOut index be00a7a..8e14dc8 100755 --- a/qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyOut +++ b/qusal/qubes-builder/files/rpc/qubesbuilder.FileCopyOut @@ -1,5 +1,9 @@ #!/usr/bin/bash +# SPDX-FileCopyrightText: 2022 - 2023 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + path="${1//__/\//}" exec /usr/lib/qubes/qfile-agent "$path" diff --git a/qusal/qubes-builder/init.sls b/qusal/qubes-builder/init.sls index e86b926..4d34bd9 100644 --- a/qusal/qubes-builder/init.sls +++ b/qusal/qubes-builder/init.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: {% if grains['id'] == 'dom0' -%} - .create diff --git a/qusal/qubes-builder/init.top b/qusal/qubes-builder/init.top index 3c22f76..f1ea665 100644 --- a/qusal/qubes-builder/init.top +++ b/qusal/qubes-builder/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/qubes-builder/install-qubes-executor.sls b/qusal/qubes-builder/install-qubes-executor.sls index c83f4d5..c9f0223 100644 --- a/qusal/qubes-builder/install-qubes-executor.sls +++ b/qusal/qubes-builder/install-qubes-executor.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated-qubes-executor": diff --git a/qusal/qubes-builder/install-qubes-executor.top b/qusal/qubes-builder/install-qubes-executor.top index a07db53..bd18804 100644 --- a/qusal/qubes-builder/install-qubes-executor.top +++ b/qusal/qubes-builder/install-qubes-executor.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-qubes-builder': - qubes-builder.install-qubes-executor diff --git a/qusal/qubes-builder/install.sls b/qusal/qubes-builder/install.sls index 46372cd..528263b 100644 --- a/qusal/qubes-builder/install.sls +++ b/qusal/qubes-builder/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/qubes-builder/install.top b/qusal/qubes-builder/install.top index 8462c11..cc8d413 100644 --- a/qusal/qubes-builder/install.top +++ b/qusal/qubes-builder/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-qubes-builder': - qubes-builder.install diff --git a/qusal/reader/README.md b/qusal/reader/README.md index 466894e..7020657 100644 --- a/qusal/reader/README.md +++ b/qusal/reader/README.md @@ -4,7 +4,7 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) +* [Credits](#credits) ## Description @@ -30,9 +30,6 @@ qubesctl state.apply reader.create qubesctl --skip-dom0 --targets=tpl-reader state.apply reader.install ``` -## Copyright +## Credits -License: GPLv3+ - -Credits: - [Unman](https://github.com/unman/shaker/tree/master/reader) diff --git a/qusal/reader/clone.sls b/qusal/reader/clone.sls index 9995809..9391fbc 100644 --- a/qusal/reader/clone.sls +++ b/qusal/reader/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/reader/clone.top b/qusal/reader/clone.top index da42b8b..4bfad83 100644 --- a/qusal/reader/clone.top +++ b/qusal/reader/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/reader/create.sls b/qusal/reader/create.sls index e64c023..a1d7df5 100644 --- a/qusal/reader/create.sls +++ b/qusal/reader/create.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 - 2023 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/reader/create.top b/qusal/reader/create.top index f4ae2a6..af6a156 100644 --- a/qusal/reader/create.top +++ b/qusal/reader/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/reader/init.top b/qusal/reader/init.top index 5cc8007..f4b161b 100644 --- a/qusal/reader/init.top +++ b/qusal/reader/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/reader/install.sls b/qusal/reader/install.sls index 9618945..7e158b4 100644 --- a/qusal/reader/install.sls +++ b/qusal/reader/install.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 - 2023 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/reader/install.top b/qusal/reader/install.top index e9c1942..986d890 100644 --- a/qusal/reader/install.top +++ b/qusal/reader/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-reader': - reader.install diff --git a/qusal/remmina/README.md b/qusal/remmina/README.md index 9b8acd5..75d27fa 100644 --- a/qusal/remmina/README.md +++ b/qusal/remmina/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -30,6 +29,3 @@ qubesctl state.apply remmina.create qubesctl --skip-dom0 --targets=tpl-remmina state.apply remmina.install qubesctl state.apply remmina.appmenus ``` -## Copyright - -License: GPLv2+ diff --git a/qusal/remmina/appmenus.sls b/qusal/remmina/appmenus.sls index 0211ae1..42bafd0 100644 --- a/qusal/remmina/appmenus.sls +++ b/qusal/remmina/appmenus.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/sync-appmenus.sls' import sync_appmenus -%} {{ sync_appmenus('tpl-' ~ sls_path) }} diff --git a/qusal/remmina/appmenus.top b/qusal/remmina/appmenus.top index 6652df1..9b381aa 100644 --- a/qusal/remmina/appmenus.top +++ b/qusal/remmina/appmenus.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/remmina/clone.sls b/qusal/remmina/clone.sls index 9995809..9391fbc 100644 --- a/qusal/remmina/clone.sls +++ b/qusal/remmina/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/remmina/clone.top b/qusal/remmina/clone.top index 4000811..72df4d3 100644 --- a/qusal/remmina/clone.top +++ b/qusal/remmina/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/remmina/create.sls b/qusal/remmina/create.sls index 0f4f96d..6335274 100644 --- a/qusal/remmina/create.sls +++ b/qusal/remmina/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/remmina/create.top b/qusal/remmina/create.top index 80ff4ac..850be21 100644 --- a/qusal/remmina/create.top +++ b/qusal/remmina/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/remmina/init.top b/qusal/remmina/init.top index 295f1ba..03833a2 100644 --- a/qusal/remmina/init.top +++ b/qusal/remmina/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/remmina/install.sls b/qusal/remmina/install.sls index c45ab2c..d9aa565 100644 --- a/qusal/remmina/install.sls +++ b/qusal/remmina/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated": diff --git a/qusal/remmina/install.top b/qusal/remmina/install.top index 81969b5..0301959 100644 --- a/qusal/remmina/install.top +++ b/qusal/remmina/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-remmina': - remmina.install diff --git a/qusal/signal/README.md b/qusal/signal/README.md index 3d28bc6..d778d5d 100644 --- a/qusal/signal/README.md +++ b/qusal/signal/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -27,7 +26,3 @@ qubesctl state.apply signal.create qubesctl --skip-dom0 --targets=tpl-signal state.apply signal.install qubesctl --skip-dom0 --targets=signal state.apply signal.configure ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/signal/clone.sls b/qusal/signal/clone.sls index 9995809..9391fbc 100644 --- a/qusal/signal/clone.sls +++ b/qusal/signal/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/signal/clone.top b/qusal/signal/clone.top index 0c85f1c..2401478 100644 --- a/qusal/signal/clone.top +++ b/qusal/signal/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/signal/configure.sls b/qusal/signal/configure.sls index 7b68566..6909045 100644 --- a/qusal/signal/configure.sls +++ b/qusal/signal/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-create-autostart-dir": diff --git a/qusal/signal/configure.top b/qusal/signal/configure.top index 34fecc0..ac1ee77 100644 --- a/qusal/signal/configure.top +++ b/qusal/signal/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/signal/create.sls b/qusal/signal/create.sls index 8b71880..537f666 100644 --- a/qusal/signal/create.sls +++ b/qusal/signal/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone - .firewall diff --git a/qusal/signal/create.top b/qusal/signal/create.top index 6b68a39..01bc002 100644 --- a/qusal/signal/create.top +++ b/qusal/signal/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/signal/firewall.sls b/qusal/signal/firewall.sls index d533b8b..362f715 100644 --- a/qusal/signal/firewall.sls +++ b/qusal/signal/firewall.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-firewall": cmd.run: - name: | diff --git a/qusal/signal/firewall.top b/qusal/signal/firewall.top index 8b1cd9f..e30e925 100644 --- a/qusal/signal/firewall.top +++ b/qusal/signal/firewall.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/signal/init.top b/qusal/signal/init.top index 2967efb..1d46369 100644 --- a/qusal/signal/init.top +++ b/qusal/signal/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/signal/install.sls b/qusal/signal/install.sls index 35a4092..d39c5cc 100644 --- a/qusal/signal/install.sls +++ b/qusal/signal/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} {% from 'utils/macros/install-repo.sls' import install_repo -%} diff --git a/qusal/signal/install.top b/qusal/signal/install.top index bae2fac..9db5679 100644 --- a/qusal/signal/install.top +++ b/qusal/signal/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-signal': - signal.install diff --git a/qusal/ssh/README.md b/qusal/ssh/README.md index 617f961..2343264 100644 --- a/qusal/ssh/README.md +++ b/qusal/ssh/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -36,7 +35,3 @@ qubesctl state.apply ssh.create qubesctl --skip-dom0 --targets=tpl-ssh state.apply ssh.install qubesctl --skip-dom0 --targets=dvm-ssh,ssh state.apply ssh.configure ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/ssh/clone.sls b/qusal/ssh/clone.sls index 9995809..9391fbc 100644 --- a/qusal/ssh/clone.sls +++ b/qusal/ssh/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/ssh/clone.top b/qusal/ssh/clone.top index 913ea5d..11b0932 100644 --- a/qusal/ssh/clone.top +++ b/qusal/ssh/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/ssh/configure.sls b/qusal/ssh/configure.sls index 1c00c9c..ec58e31 100644 --- a/qusal/ssh/configure.sls +++ b/qusal/ssh/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/ssh/configure.top b/qusal/ssh/configure.top index 5ebe3dd..3ce2689 100644 --- a/qusal/ssh/configure.top +++ b/qusal/ssh/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'ssh,dvm-ssh': - ssh.configure diff --git a/qusal/ssh/create.sls b/qusal/ssh/create.sls index cc058a0..6ca7247 100644 --- a/qusal/ssh/create.sls +++ b/qusal/ssh/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/ssh/create.top b/qusal/ssh/create.top index 0ad5dad..26a5d39 100644 --- a/qusal/ssh/create.top +++ b/qusal/ssh/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/ssh/init.top b/qusal/ssh/init.top index e1aeeba..04360a8 100644 --- a/qusal/ssh/init.top +++ b/qusal/ssh/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/ssh/install.sls b/qusal/ssh/install.sls index 83c8476..aa88252 100644 --- a/qusal/ssh/install.sls +++ b/qusal/ssh/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/ssh/install.top b/qusal/ssh/install.top index 09e7cf2..6e082cf 100644 --- a/qusal/ssh/install.top +++ b/qusal/ssh/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-ssh': - ssh.install diff --git a/qusal/sys-cacher/README.md b/qusal/sys-cacher/README.md index 102bbc4..bc1894c 100644 --- a/qusal/sys-cacher/README.md +++ b/qusal/sys-cacher/README.md @@ -5,11 +5,11 @@ * [Description](#description) * [Installation](#installation) * [Usage](#usage) - * [Connect to the cacher via IP instead of Qrexec](#connect-to-the-cacher-via-ip-instead-of-qrexec) - * [Non-TemplateVMs integration](#non-templatevms-integration) + * [Connect to the cacher via IP instead of Qrexec](#connect-to-the-cacher-via-ip-instead-of-qrexec) + * [Non-TemplateVMs integration](#non-templatevms-integration) * [Upgrade](#upgrade) * [Uninstallation](#uninstallation) -* [Copyright](#copyright) +* [Credits](#credits) ## Description @@ -17,8 +17,8 @@ Caching proxy server for software repositories on Qubes OS. The caching proxy is "sys-cacher" based on apt-cacher-ng, it stores downloaded packages, so that you need only download a package once for it to be used when -updating many templates. The proxy is preconfigured to work out of the box -for Debian, Ubuntu, Arch, and Fedora templates. +updating many The proxy is preconfigured to work out of the box +for Debian, Ubuntu, Arch, and Fedora When you install this package, qubes will be tagged with "sys-cacher-updatevm" and they will be altered to use the proxy by default. When there is "https://" @@ -115,9 +115,6 @@ qubesctl --skip-dom0 --targets=TEMPLATE state.apply sys-cacher.uninstall-client qvm-tags del TEMPLATE sys-cacher-updatevm ``` -## Copyright +## Credits -License: GPLv3+ - -Credits: - [Unman](https://github.com/unman/shaker/tree/master/cacher) diff --git a/qusal/sys-cacher/clone.sls b/qusal/sys-cacher/clone.sls index 9995809..9391fbc 100644 --- a/qusal/sys-cacher/clone.sls +++ b/qusal/sys-cacher/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-cacher/clone.top b/qusal/sys-cacher/clone.top index a98fd9e..5c27def 100644 --- a/qusal/sys-cacher/clone.top +++ b/qusal/sys-cacher/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-cacher/configure.sls b/qusal/sys-cacher/configure.sls index 85cf1be..c29356c 100644 --- a/qusal/sys-cacher/configure.sls +++ b/qusal/sys-cacher/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-cacher/configure.top b/qusal/sys-cacher/configure.top index 3476d23..32e54ab 100644 --- a/qusal/sys-cacher/configure.top +++ b/qusal/sys-cacher/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'sys-cacher': - sys-cacher.configure diff --git a/qusal/sys-cacher/create.sls b/qusal/sys-cacher/create.sls index 4868227..cb0cbae 100644 --- a/qusal/sys-cacher/create.sls +++ b/qusal/sys-cacher/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/sys-cacher/create.top b/qusal/sys-cacher/create.top index d6bd201..9b0d57f 100644 --- a/qusal/sys-cacher/create.top +++ b/qusal/sys-cacher/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-cacher/deinit.top b/qusal/sys-cacher/deinit.top index ef5d629..a0f4a6c 100644 --- a/qusal/sys-cacher/deinit.top +++ b/qusal/sys-cacher/deinit.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-cacher/files/bind-dirs/50_user.conf b/qusal/sys-cacher/files/bind-dirs/50_user.conf old mode 100644 new mode 100755 index b4c66d3..f74982c --- a/qusal/sys-cacher/files/bind-dirs/50_user.conf +++ b/qusal/sys-cacher/files/bind-dirs/50_user.conf @@ -1,2 +1,10 @@ +#!/bin/bash + +# SPDX-FileCopyrightText: 2023 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + binds+=( '/var/cache/apt-cacher-ng' ) binds+=( '/var/log/apt-cacher-ng' ) + +# vim: ft=bash diff --git a/qusal/sys-cacher/files/conf/acng.conf b/qusal/sys-cacher/files/conf/acng.conf index 2c13908..27c985e 100644 --- a/qusal/sys-cacher/files/conf/acng.conf +++ b/qusal/sys-cacher/files/conf/acng.conf @@ -1,3 +1,8 @@ +# SPDX-FileCopyrightText: 2022 unman +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + # # IMPORTANT NOTE: # diff --git a/qusal/sys-cacher/files/mirrors/archlx_mirrors b/qusal/sys-cacher/files/mirrors/archlx_mirrors index d264f06..5c1159b 100644 --- a/qusal/sys-cacher/files/mirrors/archlx_mirrors +++ b/qusal/sys-cacher/files/mirrors/archlx_mirrors @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2022 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + http://arch.hu.fo/archlinux/ http://arch.jensgutermuth.de/ http://arch.lucassymons.net/ diff --git a/qusal/sys-cacher/files/mirrors/fedora_mirrors b/qusal/sys-cacher/files/mirrors/fedora_mirrors index 4a7aee9..e2f968d 100644 --- a/qusal/sys-cacher/files/mirrors/fedora_mirrors +++ b/qusal/sys-cacher/files/mirrors/fedora_mirrors @@ -1,6 +1,10 @@ +# SPDX-FileCopyrightText: 2022 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + http://archive.linux.duke.edu/pub/fedora/linux/ http://distrib-coffee.ipsl.jussieu.fr/pub/linux/fedora/linux/ -http://dl.fedoraproject.org +http://dl.fedoraproject.org http://download-cc-rdu01.fedoraproject.org/pub/fedora/linux/ http://download-ib01.fedoraproject.org/pub/fedora/linux http://download.fedoraproject.org/pub/fedora/linux/ diff --git a/qusal/sys-cacher/files/policy/default.policy b/qusal/sys-cacher/files/policy/default.policy index beeb2e6..0ae56c3 100644 --- a/qusal/sys-cacher/files/policy/default.policy +++ b/qusal/sys-cacher/files/policy/default.policy @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. qubes.UpdatesProxy * @tag:whonix-updatevm @default allow target=sys-whonix diff --git a/qusal/sys-cacher/init.top b/qusal/sys-cacher/init.top index cd5eaee..cf99605 100644 --- a/qusal/sys-cacher/init.top +++ b/qusal/sys-cacher/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-cacher/install-client.sls b/qusal/sys-cacher/install-client.sls index 4ee50ff..81d7821 100644 --- a/qusal/sys-cacher/install-client.sls +++ b/qusal/sys-cacher/install-client.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['os_family']|lower == 'debian' -%} {% if not salt['file.file_exists']('/usr/share/whonix/marker') -%} {% for repo in salt['file.find']('/etc/apt/sources.list.d/', name='*(list|sources)') -%} diff --git a/qusal/sys-cacher/install-client.top b/qusal/sys-cacher/install-client.top index 1a45158..6113908 100644 --- a/qusal/sys-cacher/install-client.top +++ b/qusal/sys-cacher/install-client.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'I@qubes:type:template and not P@nodename:host and not P@nodename:whonix.*': - match: compound diff --git a/qusal/sys-cacher/install.sls b/qusal/sys-cacher/install.sls index 289d026..0af3634 100644 --- a/qusal/sys-cacher/install.sls +++ b/qusal/sys-cacher/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-allow-testing-repository": diff --git a/qusal/sys-cacher/install.top b/qusal/sys-cacher/install.top index 032869b..2de402b 100644 --- a/qusal/sys-cacher/install.top +++ b/qusal/sys-cacher/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-sys-cacher': - sys-cacher.install diff --git a/qusal/sys-cacher/remove-policy.sls b/qusal/sys-cacher/remove-policy.sls index 8eb5175..a066c2c 100644 --- a/qusal/sys-cacher/remove-policy.sls +++ b/qusal/sys-cacher/remove-policy.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/policy.sls' import policy_unset with context -%} {{ policy_unset(sls_path, '75') }} diff --git a/qusal/sys-cacher/tag.sls b/qusal/sys-cacher/tag.sls index e739ee9..ca7a280 100644 --- a/qusal/sys-cacher/tag.sls +++ b/qusal/sys-cacher/tag.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% set avoid = salt['cmd.shell']('qvm-ls --no-spinner --raw-list --tags whonix-updatevm') -%} {% set exclude = salt['cmd.shell']('for qube in ' ~ avoid ~ '; do exclude="$exclude --exclude $qube"; done; echo "$exclude"') -%} diff --git a/qusal/sys-cacher/tag.top b/qusal/sys-cacher/tag.top index e20c2b1..bd98f5c 100644 --- a/qusal/sys-cacher/tag.top +++ b/qusal/sys-cacher/tag.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-cacher/uninstall-client.sls b/qusal/sys-cacher/uninstall-client.sls index bc5cbed..c7210b5 100644 --- a/qusal/sys-cacher/uninstall-client.sls +++ b/qusal/sys-cacher/uninstall-client.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['os_family']|lower == 'debian' -%} {% for repo in salt['file.find']('/etc/apt/sources.list.d/', name='*(list|sources)') -%} {{ repo }}_baseurl: diff --git a/qusal/sys-cacher/uninstall-client.top b/qusal/sys-cacher/uninstall-client.top index f161be9..0f9c350 100644 --- a/qusal/sys-cacher/uninstall-client.top +++ b/qusal/sys-cacher/uninstall-client.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'qubes:type:template': - match: pillar diff --git a/qusal/sys-cacher/untag.sls b/qusal/sys-cacher/untag.sls index a051f6a..5047fd1 100644 --- a/qusal/sys-cacher/untag.sls +++ b/qusal/sys-cacher/untag.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% set wanted = salt['cmd.shell']('qvm-ls --no-spinner --raw-list') -%} {% for tpl in wanted.replace(",", " ") -%} diff --git a/qusal/sys-cacher/untag.top b/qusal/sys-cacher/untag.top index 38c1cfb..7c77521 100644 --- a/qusal/sys-cacher/untag.top +++ b/qusal/sys-cacher/untag.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-firewall/README.md b/qusal/sys-firewall/README.md index cbfe99c..de6d1c3 100644 --- a/qusal/sys-firewall/README.md +++ b/qusal/sys-firewall/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -39,7 +38,3 @@ Alternatively, if you prefer to have a disposable firewall: ```sh qubesctl state.apply sys-firewall.prefs-disp ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/sys-firewall/clone.sls b/qusal/sys-firewall/clone.sls index 9995809..9391fbc 100644 --- a/qusal/sys-firewall/clone.sls +++ b/qusal/sys-firewall/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-firewall/clone.top b/qusal/sys-firewall/clone.top index 74f0b35..14a329c 100644 --- a/qusal/sys-firewall/clone.top +++ b/qusal/sys-firewall/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-firewall/create.sls b/qusal/sys-firewall/create.sls index 21728d3..c9e59a6 100644 --- a/qusal/sys-firewall/create.sls +++ b/qusal/sys-firewall/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/sys-firewall/create.top b/qusal/sys-firewall/create.top index e0e4b20..79b7158 100644 --- a/qusal/sys-firewall/create.top +++ b/qusal/sys-firewall/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-firewall/init.top b/qusal/sys-firewall/init.top index b7bcf44..90f2ac0 100644 --- a/qusal/sys-firewall/init.top +++ b/qusal/sys-firewall/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-firewall/install.sls b/qusal/sys-firewall/install.sls index 8014bb5..2bf0df5 100644 --- a/qusal/sys-firewall/install.sls +++ b/qusal/sys-firewall/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-firewall/install.top b/qusal/sys-firewall/install.top index a520cd5..1369246 100644 --- a/qusal/sys-firewall/install.top +++ b/qusal/sys-firewall/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-sys-firewall': - sys-firewall.install diff --git a/qusal/sys-firewall/prefs-disp.sls b/qusal/sys-firewall/prefs-disp.sls index 2edc5b2..47522b9 100644 --- a/qusal/sys-firewall/prefs-disp.sls +++ b/qusal/sys-firewall/prefs-disp.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .create diff --git a/qusal/sys-firewall/prefs-disp.top b/qusal/sys-firewall/prefs-disp.top index 3d7f4c1..f701c38 100644 --- a/qusal/sys-firewall/prefs-disp.top +++ b/qusal/sys-firewall/prefs-disp.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-firewall/prefs.sls b/qusal/sys-firewall/prefs.sls index 970c659..964ec50 100644 --- a/qusal/sys-firewall/prefs.sls +++ b/qusal/sys-firewall/prefs.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .create diff --git a/qusal/sys-firewall/prefs.top b/qusal/sys-firewall/prefs.top index 29950d7..6c0eb48 100644 --- a/qusal/sys-firewall/prefs.top +++ b/qusal/sys-firewall/prefs.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-git/README.md b/qusal/sys-git/README.md index 7a7112d..aba51b8 100644 --- a/qusal/sys-git/README.md +++ b/qusal/sys-git/README.md @@ -9,7 +9,6 @@ * [Usage](#usage) * [Initialize the server repository](#initialize-the-server-repository) * [Prepare the client](#prepare-the-client) -* [Copyright](#copyright) ## Description @@ -161,7 +160,3 @@ Following pushes will be simpler: ```sh git push ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/sys-git/clone.sls b/qusal/sys-git/clone.sls index 9995809..9391fbc 100644 --- a/qusal/sys-git/clone.sls +++ b/qusal/sys-git/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-git/clone.top b/qusal/sys-git/clone.top index 27c1d8e..f4dd3df 100644 --- a/qusal/sys-git/clone.top +++ b/qusal/sys-git/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-git/configure.sls b/qusal/sys-git/configure.sls index 336b1c5..97cdb81 100644 --- a/qusal/sys-git/configure.sls +++ b/qusal/sys-git/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-git/configure.top b/qusal/sys-git/configure.top index b1e95a4..4c0a46d 100644 --- a/qusal/sys-git/configure.top +++ b/qusal/sys-git/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'sys-git': - sys-git.configure diff --git a/qusal/sys-git/create.sls b/qusal/sys-git/create.sls index 609ed70..ba1bf09 100644 --- a/qusal/sys-git/create.sls +++ b/qusal/sys-git/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/sys-git/create.top b/qusal/sys-git/create.top index 7fa93fd..efbd8d9 100644 --- a/qusal/sys-git/create.top +++ b/qusal/sys-git/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-git/files/client/git-core/git-init-qrexec b/qusal/sys-git/files/client/git-core/git-init-qrexec index e0a6e9a..fe1728c 100755 --- a/qusal/sys-git/files/client/git-core/git-init-qrexec +++ b/qusal/sys-git/files/client/git-core/git-init-qrexec @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + set -eu usage(){ diff --git a/qusal/sys-git/files/client/git-core/git-remote-qrexec b/qusal/sys-git/files/client/git-core/git-remote-qrexec index 774a42e..f61e40b 100755 --- a/qusal/sys-git/files/client/git-core/git-remote-qrexec +++ b/qusal/sys-git/files/client/git-core/git-remote-qrexec @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Portable git-remote-helper. ## Rename this helper to git-remote-. ## Valid URL format: :///. diff --git a/qusal/sys-git/files/client/git-core/git-remote-qrexec-connect b/qusal/sys-git/files/client/git-core/git-remote-qrexec-connect index a77efcf..1427e6e 100755 --- a/qusal/sys-git/files/client/git-core/git-remote-qrexec-connect +++ b/qusal/sys-git/files/client/git-core/git-remote-qrexec-connect @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Should be called by git-remote-qrexec. set -eu diff --git a/qusal/sys-git/files/policy/default.policy b/qusal/sys-git/files/policy/default.policy index cda6251..99ffba5 100644 --- a/qusal/sys-git/files/policy/default.policy +++ b/qusal/sys-git/files/policy/default.policy @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. qusal.GitFetch * @anyvm @default ask target={{ sls_path }} default_target={{ sls_path }} diff --git a/qusal/sys-git/files/rpc/qusal.GitInit b/qusal/sys-git/files/rpc/qusal.GitInit index b3ea1ad..b8c7115 100644 --- a/qusal/sys-git/files/rpc/qusal.GitInit +++ b/qusal/sys-git/files/rpc/qusal.GitInit @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + set -eu base_path="$HOME/src" diff --git a/qusal/sys-git/init.top b/qusal/sys-git/init.top index 6b45dd6..482143e 100644 --- a/qusal/sys-git/init.top +++ b/qusal/sys-git/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-git/install-client.sls b/qusal/sys-git/install-client.sls index 088981c..89dd367 100644 --- a/qusal/sys-git/install-client.sls +++ b/qusal/sys-git/install-client.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - dotfiles.copy-git - dotfiles.copy-x11 diff --git a/qusal/sys-git/install-client.top b/qusal/sys-git/install-client.top index 04a2e8a..e1d46de 100644 --- a/qusal/sys-git/install-client.top +++ b/qusal/sys-git/install-client.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - sys-git.install-client diff --git a/qusal/sys-git/install.sls b/qusal/sys-git/install.sls index ef6ff95..ec4e04d 100644 --- a/qusal/sys-git/install.sls +++ b/qusal/sys-git/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-git/install.top b/qusal/sys-git/install.top index 7d312ba..9124f37 100644 --- a/qusal/sys-git/install.top +++ b/qusal/sys-git/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-sys-git': - sys-git.install diff --git a/qusal/sys-net/README.md b/qusal/sys-net/README.md index 57d46a2..4bfb455 100644 --- a/qusal/sys-net/README.md +++ b/qusal/sys-net/README.md @@ -6,7 +6,6 @@ * [Installation](#installation) * [Usage](#usage) * [Persistent WiFi password in disposable qube](#persistent-wifi-password-in-disposable-qube) -* [Copyright](#copyright) ## Description @@ -69,7 +68,3 @@ case "$(qubesdb-read /type)" in ;; esac ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/sys-net/clone.sls b/qusal/sys-net/clone.sls index 9995809..9391fbc 100644 --- a/qusal/sys-net/clone.sls +++ b/qusal/sys-net/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-net/clone.top b/qusal/sys-net/clone.top index 3c0ec6e..48a2663 100644 --- a/qusal/sys-net/clone.top +++ b/qusal/sys-net/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-net/create.sls b/qusal/sys-net/create.sls index d1905d4..8a95db8 100644 --- a/qusal/sys-net/create.sls +++ b/qusal/sys-net/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/sys-net/create.top b/qusal/sys-net/create.top index 8c7c541..31cdda4 100644 --- a/qusal/sys-net/create.top +++ b/qusal/sys-net/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-net/files/policy/default.policy b/qusal/sys-net/files/policy/default.policy index 76cddb3..0fc2599 100644 --- a/qusal/sys-net/files/policy/default.policy +++ b/qusal/sys-net/files/policy/default.policy @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. qubes.UpdatesProxy * @tag:whonix-updatevm @default allow target=sys-whonix diff --git a/qusal/sys-net/firmware.txt b/qusal/sys-net/firmware.txt index 2128d2b..4c9b0e6 100644 --- a/qusal/sys-net/firmware.txt +++ b/qusal/sys-net/firmware.txt @@ -1,12 +1,16 @@ +# SPDX-FileCopyrightText: 2022 The Qubes OS Project +# +# SPDX-License-Identifier: GPL-3.0-or-later + +atmel-firmware firmware-ath9k-htc firmware-atheros firmware-b43-installer firmware-brcm80211 firmware-intelwimax +firmware-ipw2x00 firmware-iwlwifi +firmware-misc-nonfree firmware-ralink firmware-realtek -atmel-firmware -firmware-ipw2x00 -firmware-misc-nonfree firmware-zd1211 diff --git a/qusal/sys-net/init.top b/qusal/sys-net/init.top index eded7d4..9cdfabd 100644 --- a/qusal/sys-net/init.top +++ b/qusal/sys-net/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-net/install-debug.sls b/qusal/sys-net/install-debug.sls index 236a1b4..39da524 100644 --- a/qusal/sys-net/install-debug.sls +++ b/qusal/sys-net/install-debug.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated": diff --git a/qusal/sys-net/install-debug.top b/qusal/sys-net/install-debug.top index 048c6a8..722f2e2 100644 --- a/qusal/sys-net/install-debug.top +++ b/qusal/sys-net/install-debug.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-sys-net': - sys-net.install-debug diff --git a/qusal/sys-net/install.sls b/qusal/sys-net/install.sls index 9451494..4e1c6cd 100644 --- a/qusal/sys-net/install.sls +++ b/qusal/sys-net/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-net/install.top b/qusal/sys-net/install.top index d7ebd48..da6e0e1 100644 --- a/qusal/sys-net/install.top +++ b/qusal/sys-net/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-sys-net': - sys-net.install diff --git a/qusal/sys-net/prefs-disp.sls b/qusal/sys-net/prefs-disp.sls index 360d1b0..2bc67ba 100644 --- a/qusal/sys-net/prefs-disp.sls +++ b/qusal/sys-net/prefs-disp.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .create diff --git a/qusal/sys-net/prefs-disp.top b/qusal/sys-net/prefs-disp.top index 40fd301..1202485 100644 --- a/qusal/sys-net/prefs-disp.top +++ b/qusal/sys-net/prefs-disp.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-net/prefs.sls b/qusal/sys-net/prefs.sls index 521d7f0..da0a6d2 100644 --- a/qusal/sys-net/prefs.sls +++ b/qusal/sys-net/prefs.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .create diff --git a/qusal/sys-net/prefs.top b/qusal/sys-net/prefs.top index 1ff02a3..28d3883 100644 --- a/qusal/sys-net/prefs.top +++ b/qusal/sys-net/prefs.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-pgp/README.md b/qusal/sys-pgp/README.md index bb38ae1..76b6640 100644 --- a/qusal/sys-pgp/README.md +++ b/qusal/sys-pgp/README.md @@ -6,7 +6,6 @@ * [Installation](#installation) * [Access Control](#access-control) * [Usage](#usage) -* [Copyright](#copyright) ## Description @@ -62,7 +61,3 @@ qubes.Gpg * @anyvm @anyvm deny ## Usage Full details are at [www.qubes-os.org/doc/split-gpg](https://www.qubes-os.org/doc/split-gpg/). - -## Copyright - -License: GPLv2+ diff --git a/qusal/sys-pgp/clone.sls b/qusal/sys-pgp/clone.sls index 9995809..9391fbc 100644 --- a/qusal/sys-pgp/clone.sls +++ b/qusal/sys-pgp/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-pgp/clone.top b/qusal/sys-pgp/clone.top index c8881d9..2808ae7 100644 --- a/qusal/sys-pgp/clone.top +++ b/qusal/sys-pgp/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-pgp/configure.sls b/qusal/sys-pgp/configure.sls index 35dfabc..0ea815e 100644 --- a/qusal/sys-pgp/configure.sls +++ b/qusal/sys-pgp/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-pgp/configure.top b/qusal/sys-pgp/configure.top index 06d7171..0f51f13 100644 --- a/qusal/sys-pgp/configure.top +++ b/qusal/sys-pgp/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'sys-pgp': - match: nodegroup diff --git a/qusal/sys-pgp/create.sls b/qusal/sys-pgp/create.sls index 00d89a9..458cb4a 100644 --- a/qusal/sys-pgp/create.sls +++ b/qusal/sys-pgp/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/sys-pgp/create.top b/qusal/sys-pgp/create.top index c95c185..14b7878 100644 --- a/qusal/sys-pgp/create.top +++ b/qusal/sys-pgp/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-pgp/files/policy/default.policy b/qusal/sys-pgp/files/policy/default.policy index c04cbd9..3a13716 100644 --- a/qusal/sys-pgp/files/policy/default.policy +++ b/qusal/sys-pgp/files/policy/default.policy @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. qubes.Gpg2 * @anyvm @default ask target={{ sls_path }} default_target={{ sls_path }} diff --git a/qusal/sys-pgp/init.top b/qusal/sys-pgp/init.top index 21b7db9..b92745c 100644 --- a/qusal/sys-pgp/init.top +++ b/qusal/sys-pgp/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-pgp/install-client.sls b/qusal/sys-pgp/install-client.sls index dfaa61d..3b1f88e 100644 --- a/qusal/sys-pgp/install-client.sls +++ b/qusal/sys-pgp/install-client.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-pgp/install-client.top b/qusal/sys-pgp/install-client.top index c228898..1587227 100644 --- a/qusal/sys-pgp/install-client.top +++ b/qusal/sys-pgp/install-client.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - match: list diff --git a/qusal/sys-pgp/install.sls b/qusal/sys-pgp/install.sls index 926d2ca..bea7aaa 100644 --- a/qusal/sys-pgp/install.sls +++ b/qusal/sys-pgp/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-pgp/install.top b/qusal/sys-pgp/install.top index 0bdd18c..c046999 100644 --- a/qusal/sys-pgp/install.top +++ b/qusal/sys-pgp/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-sys-pgp': - sys-pgp.install diff --git a/qusal/sys-pihole/README.md b/qusal/sys-pihole/README.md index 35dea4c..1692781 100644 --- a/qusal/sys-pihole/README.md +++ b/qusal/sys-pihole/README.md @@ -5,7 +5,7 @@ * [Description](#description) * [Installation](#installation) * [Usage](#usage) -* [Copyright](#copyright) +* [Credits](#credits) ## Description @@ -66,10 +66,7 @@ You should change this password on first use by running: pihole -a -p ``` -## Copyright +## Credits -License: GPLv3+ - -Credits: - [Patrizio Tufarolo](https://blog.tufarolo.eu/how-to-configure-pihole-in-qubesos-proxyvm/) - [Unman](https://github.com/unman/shaker/tree/master/pihole) diff --git a/qusal/sys-pihole/clone.sls b/qusal/sys-pihole/clone.sls index 9995809..9391fbc 100644 --- a/qusal/sys-pihole/clone.sls +++ b/qusal/sys-pihole/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-pihole/clone.top b/qusal/sys-pihole/clone.top index 4b58320..b2af034 100644 --- a/qusal/sys-pihole/clone.top +++ b/qusal/sys-pihole/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-pihole/create.sls b/qusal/sys-pihole/create.sls index 5235594..7a59788 100644 --- a/qusal/sys-pihole/create.sls +++ b/qusal/sys-pihole/create.sls @@ -1,4 +1,11 @@ -{%- import "templates/debian.jinja" as template -%} +{# +SPDX-FileCopyrightText: 2022 - 2023 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import "debian/template.jinja" as template -%} ## TODO: Loop as currently it doesn't check recursively ## Use the netvm of the default_netvm. @@ -10,13 +17,13 @@ {% endif %} include: - - templates.{{ template.template_clean }}.clone + - .clone "{{ slsdotpath }}": qvm.vm: - name: {{ slsdotpath }} - require: - - sls: templates.{{ template.template_clean }}.clone + - sls: {{ slsdotpath }}.clone - present: - template: {{ template.template }} - label: orange @@ -35,10 +42,6 @@ include: - disable: - service.cups - service.cups-browsed - {% if salt['qvm.exists']('sys-cacher') -%} - - tags: - - sys-cacher-updatevm - {% endif -%} "{{ slsdotpath }}-resize-private-volume": cmd.run: diff --git a/qusal/sys-pihole/create.top b/qusal/sys-pihole/create.top index fb48695..3cb9f4e 100644 --- a/qusal/sys-pihole/create.top +++ b/qusal/sys-pihole/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-pihole/files/firewall/flush b/qusal/sys-pihole/files/firewall/flush index 2ece853..5269a56 100644 --- a/qusal/sys-pihole/files/firewall/flush +++ b/qusal/sys-pihole/files/firewall/flush @@ -1,4 +1,9 @@ #!/usr/sbin/nft -f + +# SPDX-FileCopyrightText: 2022 - 2023 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + flush chain nat PR-QBS insert rule nat PR-QBS iifname "vif*" tcp dport 53 dnat to 127.0.0.1 insert rule nat PR-QBS iifname "vif*" udp dport 53 dnat to 127.0.0.1 diff --git a/qusal/sys-pihole/files/firewall/flush.sh b/qusal/sys-pihole/files/firewall/flush.sh index d6de5e8..229b6bb 100644 --- a/qusal/sys-pihole/files/firewall/flush.sh +++ b/qusal/sys-pihole/files/firewall/flush.sh @@ -1,2 +1,10 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2022 - 2023 unman +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + +set -eu + nft -f /rw/config/network-hooks.d/flush diff --git a/qusal/sys-pihole/files/firewall/internalise.sh b/qusal/sys-pihole/files/firewall/internalise.sh index df4b1db..9dbfb29 100644 --- a/qusal/sys-pihole/files/firewall/internalise.sh +++ b/qusal/sys-pihole/files/firewall/internalise.sh @@ -1,4 +1,15 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2022 - 2023 unman +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + +set -eu + for vif in /proc/sys/net/ipv4/conf/vif*; do - echo 1 | sudo tee "$vif/route_localnet" + test -d "${vif}" || continue + test -f "${vif}/route_localnet" || continue + test -w "${vif}/route_localnet" || continue + echo 1 | tee "${vif}/route_localnet" done diff --git a/qusal/sys-pihole/files/firewall/update_nft.sh b/qusal/sys-pihole/files/firewall/update_nft.sh index f7d7bcd..bace2d7 100644 --- a/qusal/sys-pihole/files/firewall/update_nft.sh +++ b/qusal/sys-pihole/files/firewall/update_nft.sh @@ -1,5 +1,12 @@ #!/bin/sh +# SPDX-FileCopyrightText: 2022 - 2023 unman +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + +set -eu + get_handle(){ my_handle=$(nft -a list table "$1" | awk 'BEGIN{c0} /related,established/{c++; if (c==1) print $NF}') diff --git a/qusal/sys-pihole/files/network/eth0 b/qusal/sys-pihole/files/network/eth0 index 9fbf33c..b2678c0 100644 --- a/qusal/sys-pihole/files/network/eth0 +++ b/qusal/sys-pihole/files/network/eth0 @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2022 - 2023 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + auto eth0 iface eth0 inet static address diff --git a/qusal/sys-pihole/files/network/setupVars.conf b/qusal/sys-pihole/files/network/setupVars.conf index a3f97f5..3114f7b 100644 --- a/qusal/sys-pihole/files/network/setupVars.conf +++ b/qusal/sys-pihole/files/network/setupVars.conf @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2022 - 2023 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + PIHOLE_INTERFACE=eth0 PIHOLE_DNS_1=9.9.9.9 PIHOLE_DNS_2=149.112.112.112 diff --git a/qusal/sys-pihole/files/prefs.sh b/qusal/sys-pihole/files/prefs.sh index 0079347..88dda61 100755 --- a/qusal/sys-pihole/files/prefs.sh +++ b/qusal/sys-pihole/files/prefs.sh @@ -1,4 +1,10 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2022 - 2023 unman +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + set -eu qvm-start --skip-if-running sys-pihole && sleep 5 diff --git a/qusal/sys-pihole/init.top b/qusal/sys-pihole/init.top index d7fe16b..65c6e38 100644 --- a/qusal/sys-pihole/init.top +++ b/qusal/sys-pihole/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-pihole/install.sls b/qusal/sys-pihole/install.sls index e74c42a..6a1964b 100644 --- a/qusal/sys-pihole/install.sls +++ b/qusal/sys-pihole/install.sls @@ -1,10 +1,14 @@ +{# +SPDX-FileCopyrightText: 2022 - 2023 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' %} include: - dotfiles.copy-x11 -{% if salt['qvm.exists']('sys-cacher') -%} - - sys-cacher.install-client -{% endif -%} {% set qubes_ip = salt['cmd.shell']('qubesdb-read /qubes-ip') %} {% set qubes_gateway = salt['cmd.shell']('qubesdb-read /qubes-gateway') %} diff --git a/qusal/sys-pihole/install.top b/qusal/sys-pihole/install.top index 3914660..f21ad08 100644 --- a/qusal/sys-pihole/install.top +++ b/qusal/sys-pihole/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'sys-pihole': - sys-pihole.install diff --git a/qusal/sys-pihole/prefs.sls b/qusal/sys-pihole/prefs.sls index 7e34e60..6237611 100644 --- a/qusal/sys-pihole/prefs.sls +++ b/qusal/sys-pihole/prefs.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-change-prefs": cmd.script: - name: prefs.sh diff --git a/qusal/sys-pihole/prefs.top b/qusal/sys-pihole/prefs.top index 5e6f27b..2801b4c 100644 --- a/qusal/sys-pihole/prefs.top +++ b/qusal/sys-pihole/prefs.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-ssh-agent/README.md b/qusal/sys-ssh-agent/README.md index d34b58f..02813ae 100644 --- a/qusal/sys-ssh-agent/README.md +++ b/qusal/sys-ssh-agent/README.md @@ -16,7 +16,7 @@ * [Enable and Start the service](#enable-and-start-the-service-1) * [Single agent per client](#single-agent-per-client) * [Multiple agents per client](#multiple-agents-per-client) -* [Copyright](#copyright) +* [Credits](#credits) ## Description @@ -244,10 +244,6 @@ Host work ... ``` -## Copyright - -License: GPLv3+ - -Credits: +## Credits - [Unman](https://github.com/unman/qubes-ssh-agent) diff --git a/qusal/sys-ssh-agent/clone.sls b/qusal/sys-ssh-agent/clone.sls index 9995809..9391fbc 100644 --- a/qusal/sys-ssh-agent/clone.sls +++ b/qusal/sys-ssh-agent/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-ssh-agent/clone.top b/qusal/sys-ssh-agent/clone.top index 1aceeb6..3f0e40c 100644 --- a/qusal/sys-ssh-agent/clone.top +++ b/qusal/sys-ssh-agent/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-ssh-agent/configure.sls b/qusal/sys-ssh-agent/configure.sls index 266a157..b149980 100644 --- a/qusal/sys-ssh-agent/configure.sls +++ b/qusal/sys-ssh-agent/configure.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-ssh-agent/configure.top b/qusal/sys-ssh-agent/configure.top index d935db5..ce03ef1 100644 --- a/qusal/sys-ssh-agent/configure.top +++ b/qusal/sys-ssh-agent/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'sys-ssh-agent': - sys-ssh-agent.configure diff --git a/qusal/sys-ssh-agent/create.sls b/qusal/sys-ssh-agent/create.sls index 16fa65b..0b3efe2 100644 --- a/qusal/sys-ssh-agent/create.sls +++ b/qusal/sys-ssh-agent/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/sys-ssh-agent/create.top b/qusal/sys-ssh-agent/create.top index dd3b93b..1809a71 100644 --- a/qusal/sys-ssh-agent/create.top +++ b/qusal/sys-ssh-agent/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-ssh-agent/files/agent/bin/qvm-ssh-agent b/qusal/sys-ssh-agent/files/agent/bin/qvm-ssh-agent index 9622440..0511c67 100755 --- a/qusal/sys-ssh-agent/files/agent/bin/qvm-ssh-agent +++ b/qusal/sys-ssh-agent/files/agent/bin/qvm-ssh-agent @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + set -eu sock_dir="qubes-ssh-agent" diff --git a/qusal/sys-ssh-agent/files/agent/systemd/qubes-ssh-agent-sock@.service b/qusal/sys-ssh-agent/files/agent/systemd/qubes-ssh-agent-sock@.service index d68a3f0..4a6ae98 100644 --- a/qusal/sys-ssh-agent/files/agent/systemd/qubes-ssh-agent-sock@.service +++ b/qusal/sys-ssh-agent/files/agent/systemd/qubes-ssh-agent-sock@.service @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=SSH Agent on the Agent for Qrexec connections to %i ConditionUser=!root diff --git a/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client-sock@.service b/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client-sock@.service index 3fc6a57..99c727f 100644 --- a/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client-sock@.service +++ b/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client-sock@.service @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=SSH Agent on the Client targetting Qrexec SSH Agent %i ConditionUser=!root diff --git a/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client@.service b/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client@.service index d24956e..bc84b4a 100644 --- a/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client@.service +++ b/qusal/sys-ssh-agent/files/client/systemd/qubes-ssh-agent-client@.service @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Qrexec Client targetting SSH Agent %i ConditionUser=!root diff --git a/qusal/sys-ssh-agent/files/policy/default.policy b/qusal/sys-ssh-agent/files/policy/default.policy index 95d9009..b52a649 100644 --- a/qusal/sys-ssh-agent/files/policy/default.policy +++ b/qusal/sys-ssh-agent/files/policy/default.policy @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. qusal.SshAgent * @anyvm @default ask target={{ sls_path }} default_target={{ sls_path }} diff --git a/qusal/sys-ssh-agent/files/rpc/qusal.SshAgent b/qusal/sys-ssh-agent/files/rpc/qusal.SshAgent index de2046c..cbe681d 100644 --- a/qusal/sys-ssh-agent/files/rpc/qusal.SshAgent +++ b/qusal/sys-ssh-agent/files/rpc/qusal.SshAgent @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + set -eu die(){ diff --git a/qusal/sys-ssh-agent/init.top b/qusal/sys-ssh-agent/init.top index 7544d42..efe9563 100644 --- a/qusal/sys-ssh-agent/init.top +++ b/qusal/sys-ssh-agent/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-ssh-agent/install-client.sls b/qusal/sys-ssh-agent/install-client.sls index 5f3e47c..e084559 100644 --- a/qusal/sys-ssh-agent/install-client.sls +++ b/qusal/sys-ssh-agent/install-client.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-ssh-agent/install-client.top b/qusal/sys-ssh-agent/install-client.top index 5bfeeb9..64dc193 100644 --- a/qusal/sys-ssh-agent/install-client.top +++ b/qusal/sys-ssh-agent/install-client.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - sys-ssh-agent.install-client diff --git a/qusal/sys-ssh-agent/install.sls b/qusal/sys-ssh-agent/install.sls index 56265a1..e08ee62 100644 --- a/qusal/sys-ssh-agent/install.sls +++ b/qusal/sys-ssh-agent/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-ssh-agent/install.top b/qusal/sys-ssh-agent/install.top index f31769a..1a093c7 100644 --- a/qusal/sys-ssh-agent/install.top +++ b/qusal/sys-ssh-agent/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-sys-ssh-agent': - sys-ssh-agent.install diff --git a/qusal/sys-syncthing/README.md b/qusal/sys-syncthing/README.md index ba4deb5..2844c9a 100644 --- a/qusal/sys-syncthing/README.md +++ b/qusal/sys-syncthing/README.md @@ -7,7 +7,7 @@ * [Access Control](#access-control) * [Debugging](#debugging) * [Uninstallation](#uninstallation) -* [Copyright](#copyright) +* [Credits](#credits) ## Description @@ -102,9 +102,6 @@ qubesctl --skip-dom0 --targets=sys-syncthing state.apply sys-syncthing.cancel qubesctl state.apply sys-syncthing.clean ``` -## Copyright +## Credits -License: GPLv3+ - -Credits: - [Unman](https://github.com/unman/shaker/tree/master/syncthing) diff --git a/qusal/sys-syncthing/appmenus.sls b/qusal/sys-syncthing/appmenus.sls index 0211ae1..42bafd0 100644 --- a/qusal/sys-syncthing/appmenus.sls +++ b/qusal/sys-syncthing/appmenus.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/sync-appmenus.sls' import sync_appmenus -%} {{ sync_appmenus('tpl-' ~ sls_path) }} diff --git a/qusal/sys-syncthing/appmenus.top b/qusal/sys-syncthing/appmenus.top index 6db0b4f..5686a06 100644 --- a/qusal/sys-syncthing/appmenus.top +++ b/qusal/sys-syncthing/appmenus.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-syncthing/cancel.sls b/qusal/sys-syncthing/cancel.sls index 4dbcf8a..5104e00 100644 --- a/qusal/sys-syncthing/cancel.sls +++ b/qusal/sys-syncthing/cancel.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2022 unman + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-remove-service-from-rc.local": file.replace: - name: /rw/config/rc.local diff --git a/qusal/sys-syncthing/cancel.top b/qusal/sys-syncthing/cancel.top index 7e167a4..0c9fc94 100644 --- a/qusal/sys-syncthing/cancel.top +++ b/qusal/sys-syncthing/cancel.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'sys-syncthing': - sys-syncthing.configure diff --git a/qusal/sys-syncthing/clean.sls b/qusal/sys-syncthing/clean.sls index 324ca14..1e58f97 100644 --- a/qusal/sys-syncthing/clean.sls +++ b/qusal/sys-syncthing/clean.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-shutdown": qvm.shutdown: - name: {{ slsdotpath }} diff --git a/qusal/sys-syncthing/clone.sls b/qusal/sys-syncthing/clone.sls index 9995809..9391fbc 100644 --- a/qusal/sys-syncthing/clone.sls +++ b/qusal/sys-syncthing/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-syncthing/clone.top b/qusal/sys-syncthing/clone.top index e908ef6..8b48a47 100644 --- a/qusal/sys-syncthing/clone.top +++ b/qusal/sys-syncthing/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-syncthing/configure.sls b/qusal/sys-syncthing/configure.sls index 7d3e1e8..7dde54d 100644 --- a/qusal/sys-syncthing/configure.sls +++ b/qusal/sys-syncthing/configure.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + "{{ slsdotpath }}-append-to-rc.local": file.append: - name: /rw/config/rc.local diff --git a/qusal/sys-syncthing/configure.top b/qusal/sys-syncthing/configure.top index 7e167a4..0c9fc94 100644 --- a/qusal/sys-syncthing/configure.top +++ b/qusal/sys-syncthing/configure.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'sys-syncthing': - sys-syncthing.configure diff --git a/qusal/sys-syncthing/create.sls b/qusal/sys-syncthing/create.sls index d3cd0db..532508b 100644 --- a/qusal/sys-syncthing/create.sls +++ b/qusal/sys-syncthing/create.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/sys-syncthing/create.top b/qusal/sys-syncthing/create.top index c937fa4..ef205bf 100644 --- a/qusal/sys-syncthing/create.top +++ b/qusal/sys-syncthing/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-syncthing/files/firewall/in.sh b/qusal/sys-syncthing/files/firewall/in.sh index a752cf6..c49d315 100644 --- a/qusal/sys-syncthing/files/firewall/in.sh +++ b/qusal/sys-syncthing/files/firewall/in.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash + +# SPDX-FileCopyrightText: 2022 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + +## Credits: https://github.com/unman/shaker/blob/main/i2p/in.sh ## Recursively open ports through the firewall to allow remote access to a qube. -## Source: https://github.com/unman/shaker/blob/main/i2p/in.sh me="${0##*/}" diff --git a/qusal/sys-syncthing/files/policy/default.policy b/qusal/sys-syncthing/files/policy/default.policy index d033ce9..d97327d 100644 --- a/qusal/sys-syncthing/files/policy/default.policy +++ b/qusal/sys-syncthing/files/policy/default.policy @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. qusal.Syncthing * @anyvm @default ask target={{ sls_path }} default_target={{ sls_path }} diff --git a/qusal/sys-syncthing/files/repo/syncthing.list b/qusal/sys-syncthing/files/repo/syncthing.list index 9dffce0..b0e5a70 100644 --- a/qusal/sys-syncthing/files/repo/syncthing.list +++ b/qusal/sys-syncthing/files/repo/syncthing.list @@ -1,2 +1,2 @@ -deb [signed-by=/usr/share/keyrings/syncthing.asc] https://apt.syncthing.net/ syncthing stable +deb [signed-by=/usr/share/keyrings/syncthing.asc] http://apt.syncthing.net/ syncthing stable # vim:ft=debsources diff --git a/qusal/sys-syncthing/files/rpc/qubes-syncthing.service b/qusal/sys-syncthing/files/rpc/qubes-syncthing.service index a0af480..8c89597 100644 --- a/qusal/sys-syncthing/files/rpc/qubes-syncthing.service +++ b/qusal/sys-syncthing/files/rpc/qubes-syncthing.service @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2022 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Syncthing over Qrexec After=qubes-qrexec-agent.service diff --git a/qusal/sys-syncthing/files/rpc/qusal.Syncthing b/qusal/sys-syncthing/files/rpc/qusal.Syncthing index 2687a41..55d7f61 100644 --- a/qusal/sys-syncthing/files/rpc/qusal.Syncthing +++ b/qusal/sys-syncthing/files/rpc/qusal.Syncthing @@ -1,2 +1,7 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2022 unman +# +# SPDX-License-Identifier: GPL-3.0-or-later + exec socat STDIO TCP:localhost:22000 diff --git a/qusal/sys-syncthing/init.top b/qusal/sys-syncthing/init.top index 6b7e7ce..288130d 100644 --- a/qusal/sys-syncthing/init.top +++ b/qusal/sys-syncthing/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-syncthing/install.sls b/qusal/sys-syncthing/install.sls index f7e64f7..2ed6f5d 100644 --- a/qusal/sys-syncthing/install.sls +++ b/qusal/sys-syncthing/install.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 - 2023 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} {% from 'utils/macros/install-repo.sls' import install_repo -%} diff --git a/qusal/sys-syncthing/install.top b/qusal/sys-syncthing/install.top index dad3952..dd665a8 100644 --- a/qusal/sys-syncthing/install.top +++ b/qusal/sys-syncthing/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-sys-syncthing': - sys-syncthing.install diff --git a/qusal/sys-usb/README.md b/qusal/sys-usb/README.md index 052e01a..bc43a99 100644 --- a/qusal/sys-usb/README.md +++ b/qusal/sys-usb/README.md @@ -4,7 +4,7 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) +* [Credits](#credits) ## Description @@ -46,6 +46,6 @@ If the client requires a FIDO device, install on the client template: qubesctl --skip-dom0 --targets=tpl-QUBE state.apply sys-usb.install-client-fido ``` -## Copyright +## Credits -License: GPLv2+ +- [Unman](https://github.com/unman/shaker/blob/main/sys-usb) diff --git a/qusal/sys-usb/clone.sls b/qusal/sys-usb/clone.sls index 9995809..9391fbc 100644 --- a/qusal/sys-usb/clone.sls +++ b/qusal/sys-usb/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/sys-usb/clone.top b/qusal/sys-usb/clone.top index c542d98..6494c6f 100644 --- a/qusal/sys-usb/clone.top +++ b/qusal/sys-usb/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-usb/create.sls b/qusal/sys-usb/create.sls index 9dec922..59c4471 100644 --- a/qusal/sys-usb/create.sls +++ b/qusal/sys-usb/create.sls @@ -1,3 +1,10 @@ +{# +SPDX-FileCopyrightText: 2022 unman +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone - qvm.hide-usb-from-dom0 diff --git a/qusal/sys-usb/create.top b/qusal/sys-usb/create.top index 93bf3d3..1500a5e 100644 --- a/qusal/sys-usb/create.top +++ b/qusal/sys-usb/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-usb/files/policy/default.policy b/qusal/sys-usb/files/policy/default.policy index d33a90f..e8f4eb5 100644 --- a/qusal/sys-usb/files/policy/default.policy +++ b/qusal/sys-usb/files/policy/default.policy @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + ## Do not modify this file, create a new policy with with a lower number in the ## file name instead. For example `30-user.policy`. qubes.InputKeyboard * {{ sls_path }} dom0 allow user=root diff --git a/qusal/sys-usb/init.top b/qusal/sys-usb/init.top index f70719a..4eb722b 100644 --- a/qusal/sys-usb/init.top +++ b/qusal/sys-usb/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/sys-usb/install-client-cryptsetup.sls b/qusal/sys-usb/install-client-cryptsetup.sls index e060de6..434277d 100644 --- a/qusal/sys-usb/install-client-cryptsetup.sls +++ b/qusal/sys-usb/install-client-cryptsetup.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-usb/install-client-cryptsetup.top b/qusal/sys-usb/install-client-cryptsetup.top index a27baa7..39c0ef5 100644 --- a/qusal/sys-usb/install-client-cryptsetup.top +++ b/qusal/sys-usb/install-client-cryptsetup.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - sys-usb.install-client-cryptsetup diff --git a/qusal/sys-usb/install-client-fido.sls b/qusal/sys-usb/install-client-fido.sls index a71b6f1..fd01a1f 100644 --- a/qusal/sys-usb/install-client-fido.sls +++ b/qusal/sys-usb/install-client-fido.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-usb/install-client-fido.top b/qusal/sys-usb/install-client-fido.top index 59fd771..2c7cc1f 100644 --- a/qusal/sys-usb/install-client-fido.top +++ b/qusal/sys-usb/install-client-fido.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - sys-usb.install-client-fido diff --git a/qusal/sys-usb/install-client-proxy.sls b/qusal/sys-usb/install-client-proxy.sls index 84def0c..e137576 100644 --- a/qusal/sys-usb/install-client-proxy.sls +++ b/qusal/sys-usb/install-client-proxy.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated-proxy": diff --git a/qusal/sys-usb/install-client-proxy.top b/qusal/sys-usb/install-client-proxy.top index 3d5ae2d..f0c8c4e 100644 --- a/qusal/sys-usb/install-client-proxy.top +++ b/qusal/sys-usb/install-client-proxy.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - sys-usb.install-client-proxy diff --git a/qusal/sys-usb/install-client.sls b/qusal/sys-usb/install-client.sls index 2169cb4..b18e7d5 100644 --- a/qusal/sys-usb/install-client.sls +++ b/qusal/sys-usb/install-client.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/sys-usb/install-client.top b/qusal/sys-usb/install-client.top index a034551..32daa5d 100644 --- a/qusal/sys-usb/install-client.top +++ b/qusal/sys-usb/install-client.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - sys-usb.install-client diff --git a/qusal/sys-usb/install.sls b/qusal/sys-usb/install.sls index 245aeb8..0fbea32 100644 --- a/qusal/sys-usb/install.sls +++ b/qusal/sys-usb/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated": diff --git a/qusal/sys-usb/install.top b/qusal/sys-usb/install.top index c110ed3..d6b4aa5 100644 --- a/qusal/sys-usb/install.top +++ b/qusal/sys-usb/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-sys-usb': - sys-usb.install diff --git a/qusal/sys-usb/keyboard.sls b/qusal/sys-usb/keyboard.sls index 9f9ed04..a294c81 100644 --- a/qusal/sys-usb/keyboard.sls +++ b/qusal/sys-usb/keyboard.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + # Based on 'qvm.usb-keyboard'. include: diff --git a/qusal/sys-usb/keyboard.top b/qusal/sys-usb/keyboard.top index accb5ad..e4e3034 100644 --- a/qusal/sys-usb/keyboard.top +++ b/qusal/sys-usb/keyboard.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/templates/README.md b/qusal/templates/README.md deleted file mode 100644 index 638c083..0000000 --- a/qusal/templates/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# templates - -## Table of Contents - -* [Description](#description) -* [Installation](#installation) -* [Copyright](#copyright) - -## Description - -Install templates on Qubes OS. - -## Installation - -Check the README.md in each directory. - -## Copyright - -License: GPLv2+ diff --git a/qusal/templates/debian-minimal/README.md b/qusal/templates/debian-minimal/README.md deleted file mode 100644 index 2b6cace..0000000 --- a/qusal/templates/debian-minimal/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# debian-minimal - -## Table of Contents - -* [Description](#description) -* [Installation](#installation) -* [Copyright](#copyright) - -## Description - -Download and configure the Debian Minimal Template. - -## Installation - -- Top: -```sh -qubesctl top.enable templates.debian-minimal -qubesctl --targets=debian-12-minimal state.apply -qubesctl top.disable templates.debian-minimal -``` -- State: -```sh -qubesctl state.apply templates.debian-minimal.create -qubesctl --skip-dom0 --targets=debian-12-minimal state.apply templates.debian-minimal.install -``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/templates/debian-minimal/clone.sls b/qusal/templates/debian-minimal/clone.sls deleted file mode 100644 index ddda78f..0000000 --- a/qusal/templates/debian-minimal/clone.sls +++ /dev/null @@ -1,6 +0,0 @@ -{%- import "templates/debian-minimal.jinja" as template -%} - -"{{ template.template }}-template-installed": - qvm.template_installed: - - name: {{ template.template }} - - fromrepo: {{ template.repo }} diff --git a/qusal/templates/debian-minimal/clone.top b/qusal/templates/debian-minimal/clone.top deleted file mode 100644 index 6f6f13a..0000000 --- a/qusal/templates/debian-minimal/clone.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.debian-minimal.clone diff --git a/qusal/templates/debian-minimal/create.top b/qusal/templates/debian-minimal/create.top deleted file mode 100644 index da9f48d..0000000 --- a/qusal/templates/debian-minimal/create.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.debian-minimal.create diff --git a/qusal/templates/debian-minimal/init.top b/qusal/templates/debian-minimal/init.top deleted file mode 100644 index eda592b..0000000 --- a/qusal/templates/debian-minimal/init.top +++ /dev/null @@ -1,7 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.debian-minimal.create - 'I@qubes:type:template and E@^debian-[0-9][0-9]-minimal$': - - match: compound - - templates.debian-minimal.install diff --git a/qusal/templates/debian-minimal/install.top b/qusal/templates/debian-minimal/install.top deleted file mode 100644 index 4759ea7..0000000 --- a/qusal/templates/debian-minimal/install.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'I@qubes:type:template and E@^debian-[0-9][0-9]-minimal$': - - match: compound - - templates.debian-minimal.install diff --git a/qusal/templates/debian/README.md b/qusal/templates/debian/README.md deleted file mode 100644 index 12d6d7d..0000000 --- a/qusal/templates/debian/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# debian - -## Table of Contents - -* [Description](#description) -* [Installation](#installation) -* [Copyright](#copyright) - -## Description - -Download and configure the Debian Template. - -## Installation - -- Top: -```sh -qubesctl top.enable templates.debian -qubesctl --targets=debian-12 state.apply -qubesctl top.disable templates.debian -``` -- State: -```sh -qubesctl state.apply templates.debian.create -qubesctl --skip-dom0 --targets=debian-12 state.apply templates.debian.install -``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/templates/debian/clone.sls b/qusal/templates/debian/clone.sls deleted file mode 100644 index fb69b03..0000000 --- a/qusal/templates/debian/clone.sls +++ /dev/null @@ -1,6 +0,0 @@ -{%- import "templates/debian.jinja" as template -%} - -"{{ template.template }}-template-installed": - qvm.template_installed: - - name: {{ template.template }} - - fromrepo: {{ template.repo }} diff --git a/qusal/templates/debian/clone.top b/qusal/templates/debian/clone.top deleted file mode 100644 index fce74e7..0000000 --- a/qusal/templates/debian/clone.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.debian.clone diff --git a/qusal/templates/debian/create.top b/qusal/templates/debian/create.top deleted file mode 100644 index 012ab31..0000000 --- a/qusal/templates/debian/create.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.debian.create diff --git a/qusal/templates/debian/init.top b/qusal/templates/debian/init.top deleted file mode 100644 index 3625c99..0000000 --- a/qusal/templates/debian/init.top +++ /dev/null @@ -1,7 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.debian.create - 'I@qubes:type:template and E@^debian-[0-9][0-9]$': - - match: compound - - templates.debian.install diff --git a/qusal/templates/debian/install.top b/qusal/templates/debian/install.top deleted file mode 100644 index 077eacb..0000000 --- a/qusal/templates/debian/install.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.debian.install diff --git a/qusal/templates/fedora-minimal/README.md b/qusal/templates/fedora-minimal/README.md deleted file mode 100644 index 52db556..0000000 --- a/qusal/templates/fedora-minimal/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# fedora-minimal - -## Table of Contents - -* [Description](#description) -* [Installation](#installation) -* [Copyright](#copyright) - -## Description - -Download and configure the Fedora Minimal Template. - -## Installation - -- Top: -```sh -qubesctl top.enable templates.fedora-minimal -qubesctl --targets=fedora-38-minimal state.apply -qubesctl top.disable templates.fedora-minimal -``` -- State: -```sh -qubesctl state.apply templates.fedora-minimal.create -qubesctl --skip-dom0 --targets=fedora-38-minimal state.apply templates.fedora-minimal.install -``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/templates/fedora-minimal/clone.sls b/qusal/templates/fedora-minimal/clone.sls deleted file mode 100644 index 667380f..0000000 --- a/qusal/templates/fedora-minimal/clone.sls +++ /dev/null @@ -1,6 +0,0 @@ -{%- import "templates/fedora-minimal.jinja" as template -%} - -"{{ template.template }}-template-installed": - qvm.template_installed: - - name: {{ template.template }} - - fromrepo: {{ template.repo }} diff --git a/qusal/templates/fedora-minimal/clone.top b/qusal/templates/fedora-minimal/clone.top deleted file mode 100644 index 6a4b1a2..0000000 --- a/qusal/templates/fedora-minimal/clone.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.fedora-minimal.clone diff --git a/qusal/templates/fedora-minimal/create.top b/qusal/templates/fedora-minimal/create.top deleted file mode 100644 index a65a497..0000000 --- a/qusal/templates/fedora-minimal/create.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.fedora-minimal.create diff --git a/qusal/templates/fedora-minimal/init.top b/qusal/templates/fedora-minimal/init.top deleted file mode 100644 index b5ccde3..0000000 --- a/qusal/templates/fedora-minimal/init.top +++ /dev/null @@ -1,7 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.fedora-minimal.create - 'I@qubes:type:template and E@^fedora-[0-9][0-9]-minimal$': - - match: compound - - templates.fedora-minimal.install diff --git a/qusal/templates/fedora-minimal/install.top b/qusal/templates/fedora-minimal/install.top deleted file mode 100644 index 00776a0..0000000 --- a/qusal/templates/fedora-minimal/install.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.fedora-minimal.install diff --git a/qusal/templates/fedora/README.md b/qusal/templates/fedora/README.md deleted file mode 100644 index 2ae7ea9..0000000 --- a/qusal/templates/fedora/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# fedora - -## Table of Contents - -* [Description](#description) -* [Installation](#installation) -* [Copyright](#copyright) - -## Description - -Download and configure the Fedora Template. - -## Installation - -- Top: -```sh -qubesctl top.enable templates.fedora -qubesctl --targets=fedora-38 state.apply -qubesctl top.disable templates.fedora -``` -- State: -```sh -qubesctl state.apply templates.fedora.create -qubesctl --skip-dom0 --targets=fedora-38 state.apply templates.fedora.install -``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/templates/fedora/clone.sls b/qusal/templates/fedora/clone.sls deleted file mode 100644 index fd56e13..0000000 --- a/qusal/templates/fedora/clone.sls +++ /dev/null @@ -1,6 +0,0 @@ -{%- import "templates/fedora.jinja" as template -%} - -"{{ template.template }}-template-installed": - qvm.template_installed: - - name: {{ template.template }} - - fromrepo: {{ template.repo }} diff --git a/qusal/templates/fedora/clone.top b/qusal/templates/fedora/clone.top deleted file mode 100644 index 468e49f..0000000 --- a/qusal/templates/fedora/clone.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.fedora.clone diff --git a/qusal/templates/fedora/create.top b/qusal/templates/fedora/create.top deleted file mode 100644 index eef0f5e..0000000 --- a/qusal/templates/fedora/create.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.fedora.create diff --git a/qusal/templates/fedora/init.top b/qusal/templates/fedora/init.top deleted file mode 100644 index 9431020..0000000 --- a/qusal/templates/fedora/init.top +++ /dev/null @@ -1,7 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.fedora.create - 'I@qubes:type:template and E@^fedora-[0-9][0-9]$': - - match: compound - - templates.fedora.install diff --git a/qusal/templates/fedora/install.top b/qusal/templates/fedora/install.top deleted file mode 100644 index 8353510..0000000 --- a/qusal/templates/fedora/install.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.fedora.install diff --git a/qusal/templates/whonix/clone.top b/qusal/templates/whonix/clone.top deleted file mode 100644 index 69ba47f..0000000 --- a/qusal/templates/whonix/clone.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.whonix.clone diff --git a/qusal/templates/whonix/create.sls b/qusal/templates/whonix/create.sls deleted file mode 100644 index da6fe98..0000000 --- a/qusal/templates/whonix/create.sls +++ /dev/null @@ -1,2 +0,0 @@ -include: - - whonix.clone diff --git a/qusal/templates/whonix/create.top b/qusal/templates/whonix/create.top deleted file mode 100644 index e1e54be..0000000 --- a/qusal/templates/whonix/create.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.whonix.create diff --git a/qusal/templates/whonix/init.top b/qusal/templates/whonix/init.top deleted file mode 100644 index e1e54be..0000000 --- a/qusal/templates/whonix/init.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.whonix.create diff --git a/qusal/templates/whonix/install.top b/qusal/templates/whonix/install.top deleted file mode 100644 index f784f20..0000000 --- a/qusal/templates/whonix/install.top +++ /dev/null @@ -1,4 +0,0 @@ -base: - 'dom0': - - match: nodegroup - - templates.whonix.install diff --git a/qusal/terraform/README.md b/qusal/terraform/README.md index ed040b2..78cddf0 100644 --- a/qusal/terraform/README.md +++ b/qusal/terraform/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -26,7 +25,3 @@ qubesctl top.disable terraform qubesctl state.apply terraform.create qubesctl --skip-dom0 --targets=tpl-terraform state.apply terraform.install ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/terraform/clone.sls b/qusal/terraform/clone.sls index 9995809..9391fbc 100644 --- a/qusal/terraform/clone.sls +++ b/qusal/terraform/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/terraform/clone.top b/qusal/terraform/clone.top index 5f9d5d2..ec30293 100644 --- a/qusal/terraform/clone.top +++ b/qusal/terraform/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/terraform/create.sls b/qusal/terraform/create.sls index b54cdb8..760bdc84 100644 --- a/qusal/terraform/create.sls +++ b/qusal/terraform/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/terraform/create.top b/qusal/terraform/create.top index 4de4705..4c38c83 100644 --- a/qusal/terraform/create.top +++ b/qusal/terraform/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/terraform/init.top b/qusal/terraform/init.top index fee103c..32c4ac5 100644 --- a/qusal/terraform/init.top +++ b/qusal/terraform/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/terraform/install.sls b/qusal/terraform/install.sls index baf3a8e..ba03966 100644 --- a/qusal/terraform/install.sls +++ b/qusal/terraform/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} {% from 'utils/macros/install-repo.sls' import install_repo -%} diff --git a/qusal/terraform/install.top b/qusal/terraform/install.top index 9cd0c93..089257e 100644 --- a/qusal/terraform/install.top +++ b/qusal/terraform/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-terraform': - terraform.install diff --git a/qusal/utils/macros/clone-template.sls b/qusal/utils/macros/clone-template.sls index 5ba0159..f484755 100644 --- a/qusal/utils/macros/clone-template.sls +++ b/qusal/utils/macros/clone-template.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {# Usage: 1: Import this template: @@ -9,15 +15,15 @@ Usage: {% macro clone_template(source, name) -%} -{%- import "templates/" ~ source ~ ".jinja" as template -%} +{%- import source ~ "/template.jinja" as template -%} include: - - templates.{{ source }}.create + - {{ source }}.create "tpl-{{ name }}-clone": qvm.clone: - require: - - sls: templates.{{ source }}.clone + - sls: {{ source }}.create - source: {{ template.template }} - name: tpl-{{ name }} diff --git a/qusal/utils/macros/install-repo.sls b/qusal/utils/macros/install-repo.sls index 312c5ae..07400a9 100644 --- a/qusal/utils/macros/install-repo.sls +++ b/qusal/utils/macros/install-repo.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {# Install repositories with ease. diff --git a/qusal/utils/macros/policy.sls b/qusal/utils/macros/policy.sls index 0ebe87f..264f45d 100644 --- a/qusal/utils/macros/policy.sls +++ b/qusal/utils/macros/policy.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {# Qubes RPC Policy Template diff --git a/qusal/utils/macros/switch-template.sls b/qusal/utils/macros/switch-template.sls index 0d6cd4c..969194b 100644 --- a/qusal/utils/macros/switch-template.sls +++ b/qusal/utils/macros/switch-template.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {# Switch Template to Default Template diff --git a/qusal/utils/macros/sync-appmenus.sls b/qusal/utils/macros/sync-appmenus.sls index 0572524..f9a0c5a 100644 --- a/qusal/utils/macros/sync-appmenus.sls +++ b/qusal/utils/macros/sync-appmenus.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {# Qubes Sync Appmenus diff --git a/qusal/utils/tools/builder/README.md b/qusal/utils/tools/builder/README.md index ef04b03..867ac6d 100644 --- a/qusal/utils/tools/builder/README.md +++ b/qusal/utils/tools/builder/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -23,7 +22,3 @@ Install documentation tools on templates: ```sh qubesctl --skip-dom0 --targets=TEMPLATEVMS state.apply utils.tools.builder.doc ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/utils/tools/builder/core.sls b/qusal/utils/tools/builder/core.sls index f3d55db..07dac1b 100644 --- a/qusal/utils/tools/builder/core.sls +++ b/qusal/utils/tools/builder/core.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-core-updated": diff --git a/qusal/utils/tools/builder/doc.sls b/qusal/utils/tools/builder/doc.sls index 3b7cab8..5ce2998 100644 --- a/qusal/utils/tools/builder/doc.sls +++ b/qusal/utils/tools/builder/doc.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-doc-updated": diff --git a/qusal/utils/tools/zsh/README.md b/qusal/utils/tools/zsh/README.md index fee7535..90176a8 100644 --- a/qusal/utils/tools/zsh/README.md +++ b/qusal/utils/tools/zsh/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -27,7 +26,3 @@ qubesctl top.disable utils.tools.zsh qubesctl --skip-dom0 --targets=TEMPLATEVMS state.apply utils.tools.zsh.change-shell qubesctl --skip-dom0 --targets=APPVMS state.apply utils.tools.zsh.touch-zshrc ``` - -## Copyright - -License: GPLv2+ diff --git a/qusal/utils/tools/zsh/change-shell.sls b/qusal/utils/tools/zsh/change-shell.sls index 84d1568..f0980fd 100644 --- a/qusal/utils/tools/zsh/change-shell.sls +++ b/qusal/utils/tools/zsh/change-shell.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/utils/tools/zsh/change-shell.top b/qusal/utils/tools/zsh/change-shell.top index fe44d78..74456ad 100644 --- a/qusal/utils/tools/zsh/change-shell.top +++ b/qusal/utils/tools/zsh/change-shell.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - utils.tools.zsh.change-shell diff --git a/qusal/utils/tools/zsh/init.sls b/qusal/utils/tools/zsh/init.sls index d55dd4b..89bdb50 100644 --- a/qusal/utils/tools/zsh/init.sls +++ b/qusal/utils/tools/zsh/init.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .install - .touch-zshrc diff --git a/qusal/utils/tools/zsh/init.top b/qusal/utils/tools/zsh/init.top index 3b04340..11ba672 100644 --- a/qusal/utils/tools/zsh/init.top +++ b/qusal/utils/tools/zsh/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - utils.tools.zsh.touch-zshrc diff --git a/qusal/utils/tools/zsh/install.sls b/qusal/utils/tools/zsh/install.sls index 18b4f1f..db300b3 100644 --- a/qusal/utils/tools/zsh/install.sls +++ b/qusal/utils/tools/zsh/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/utils/tools/zsh/install.top b/qusal/utils/tools/zsh/install.top index fb618b2..debbdcf 100644 --- a/qusal/utils/tools/zsh/install.top +++ b/qusal/utils/tools/zsh/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - utils.tools.zsh.install diff --git a/qusal/utils/tools/zsh/touch-zshrc.sls b/qusal/utils/tools/zsh/touch-zshrc.sls index e462a51..9dfa9e8 100644 --- a/qusal/utils/tools/zsh/touch-zshrc.sls +++ b/qusal/utils/tools/zsh/touch-zshrc.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + # zsh complains if there is no .zshrc when. # Only useful if not using the dotfiles but installing zsh. diff --git a/qusal/utils/tools/zsh/touch-zshrc.top b/qusal/utils/tools/zsh/touch-zshrc.top index 504b56c..51419ad 100644 --- a/qusal/utils/tools/zsh/touch-zshrc.top +++ b/qusal/utils/tools/zsh/touch-zshrc.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: '*': - utils.tools.zsh.touch-zshrc diff --git a/qusal/vault/README.md b/qusal/vault/README.md index 97f7512..340e825 100644 --- a/qusal/vault/README.md +++ b/qusal/vault/README.md @@ -5,7 +5,6 @@ * [Description](#description) * [Installation](#installation) * [Usage](#usage) -* [Copyright](#copyright) ## Description @@ -39,7 +38,3 @@ server for SSH, PGP, Pass. You should use a separate qube for split-ssh, split-gpg2 or any other split-action operations that allows access to the vault qube, as it increases the attack surface. - -## Copyright - -License: GPLv2+ diff --git a/qusal/vault/clone.sls b/qusal/vault/clone.sls index 9995809..9391fbc 100644 --- a/qusal/vault/clone.sls +++ b/qusal/vault/clone.sls @@ -1,2 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% from 'utils/macros/clone-template.sls' import clone_template -%} {{ clone_template('debian-minimal', sls_path) }} diff --git a/qusal/vault/clone.top b/qusal/vault/clone.top index 7940dcc..c9c17f5 100644 --- a/qusal/vault/clone.top +++ b/qusal/vault/clone.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/vault/create.sls b/qusal/vault/create.sls index 0f0a9f3..93ebfb3 100644 --- a/qusal/vault/create.sls +++ b/qusal/vault/create.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + include: - .clone diff --git a/qusal/vault/create.top b/qusal/vault/create.top index 6df9921..140886a 100644 --- a/qusal/vault/create.top +++ b/qusal/vault/create.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/vault/init.top b/qusal/vault/init.top index 136e006..72bf99d 100644 --- a/qusal/vault/init.top +++ b/qusal/vault/init.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'dom0': - match: nodegroup diff --git a/qusal/vault/install.sls b/qusal/vault/install.sls index 0f3cf32..2fc2542 100644 --- a/qusal/vault/install.sls +++ b/qusal/vault/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} include: diff --git a/qusal/vault/install.top b/qusal/vault/install.top index c795ecc..0b8685a 100644 --- a/qusal/vault/install.top +++ b/qusal/vault/install.top @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + base: 'tpl-vault': - vault.install diff --git a/qusal/templates/whonix/README.md b/qusal/whonix/README.md similarity index 67% rename from qusal/templates/whonix/README.md rename to qusal/whonix/README.md index 1e82e29..0b934cb 100644 --- a/qusal/templates/whonix/README.md +++ b/qusal/whonix/README.md @@ -4,7 +4,6 @@ * [Description](#description) * [Installation](#installation) -* [Copyright](#copyright) ## Description @@ -14,18 +13,15 @@ Download and configure Whonix. - Top: ```sh -qubesctl top.enable templates.whonix +qubesctl top.enable whonix qubesctl state.apply -qubesctl top.disable templates.whonix +qubesctl top.disable whonix qubesctl state.apply qvm.anon-whonix qubesctl state.apply qvm.whonix-ws-dvm ``` - State: ```sh -qubesctl state.apply templates.whonix.create +qubesctl state.apply whonix.create qubesctl state.apply qvm.anon-whonix qubesctl state.apply qvm.whonix-ws-dvm ``` -## Copyright - -License: GPLv2+ diff --git a/qusal/templates/whonix/clone.sls b/qusal/whonix/clone.sls similarity index 67% rename from qusal/templates/whonix/clone.sls rename to qusal/whonix/clone.sls index 2cb2546..a65e54f 100644 --- a/qusal/templates/whonix/clone.sls +++ b/qusal/whonix/clone.sls @@ -1,4 +1,10 @@ -{%- import "templates/whonix.jinja" as whonix -%} +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{%- import slsdotpath ~ "/template.jinja" as whonix -%} "{{ whonix.whonix_gw_template }}-installed": qvm.template_installed: diff --git a/qusal/whonix/clone.top b/qusal/whonix/clone.top new file mode 100644 index 0000000..5ae0957 --- /dev/null +++ b/qusal/whonix/clone.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - whonix.clone diff --git a/qusal/whonix/create.sls b/qusal/whonix/create.sls new file mode 100644 index 0000000..3aed8b2 --- /dev/null +++ b/qusal/whonix/create.sls @@ -0,0 +1,8 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +include: + - whonix.clone diff --git a/qusal/whonix/create.top b/qusal/whonix/create.top new file mode 100644 index 0000000..fb3c1e3 --- /dev/null +++ b/qusal/whonix/create.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - whonix.create diff --git a/qusal/whonix/init.top b/qusal/whonix/init.top new file mode 100644 index 0000000..fb3c1e3 --- /dev/null +++ b/qusal/whonix/init.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - whonix.create diff --git a/qusal/templates/fedora/install.sls b/qusal/whonix/install.sls similarity index 54% rename from qusal/templates/fedora/install.sls rename to qusal/whonix/install.sls index c1f5dda..c23907c 100644 --- a/qusal/templates/fedora/install.sls +++ b/qusal/whonix/install.sls @@ -1,3 +1,9 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + {% if grains['nodename'] != 'dom0' -%} "{{ slsdotpath }}-updated": diff --git a/qusal/whonix/install.top b/qusal/whonix/install.top new file mode 100644 index 0000000..66be7ed --- /dev/null +++ b/qusal/whonix/install.top @@ -0,0 +1,10 @@ +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +base: + 'dom0': + - match: nodegroup + - whonix.install diff --git a/qusal/templates/whonix.jinja b/qusal/whonix/template.jinja similarity index 77% rename from qusal/templates/whonix.jinja rename to qusal/whonix/template.jinja index 04b9a85..409c940 100644 --- a/qusal/templates/whonix.jinja +++ b/qusal/whonix/template.jinja @@ -1,4 +1,10 @@ -{% set whonix_version = salt['pillar.get']('qvm:whonix:version', '37') -%} +{# +SPDX-FileCopyrightText: 2023 Qusal contributors + +SPDX-License-Identifier: GPL-3.0-or-later +#} + +{% set whonix_version = salt['pillar.get']('qvm:whonix:version', '17') -%} {% set whonix_repo = salt['pillar.get']('qvm:whonix:repo', 'qubes-templates-community') -%} {% set whonix_ws_template = 'whonix-ws-' ~ whonix_version -%} {% set whonix_gw_template = 'whonix-gw-' ~ whonix_version -%} diff --git a/rpm_spec/example.spec.tpl b/rpm_spec/example.spec.tpl index 54db7a8..7e79a6d 100644 --- a/rpm_spec/example.spec.tpl +++ b/rpm_spec/example.spec.tpl @@ -1,4 +1,9 @@ # vim: ft=spec + +# SPDX-FileCopyrightText: 2023 Qusal contributors +# +# SPDX-License-Identifier: GPL-3.0-or-later + # Instructions: # https://rpm-software-management.github.io/rpm/manual/spec.html # http://ftp.rpm.org/max-rpm/s1-rpm-inside-tags.html diff --git a/scripts/salt-fix.sh b/scripts/salt-fix.sh index 9874593..19827a0 100755 --- a/scripts/salt-fix.sh +++ b/scripts/salt-fix.sh @@ -1,6 +1,15 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2013-2018 Will Thames will@thames.id.au +## SPDX-FileCopyrightText: 2018 Ansible by Red Hat +## SPDX-FileCopyrightText: 2020 - 2023 Warpnet B.V. +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + +## Credits: https://salt-lint.readthedocs.io/en/latest/#fix-common-issues + # shellcheck disable=SC2086 -## Based on https://salt-lint.readthedocs.io/en/latest/#fix-common-issues set -eu command -v git >/dev/null || diff --git a/scripts/salt-lint.sh b/scripts/salt-lint.sh index a87f9a6..8460e9b 100755 --- a/scripts/salt-lint.sh +++ b/scripts/salt-lint.sh @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC2086 set -eu diff --git a/scripts/setup.sh b/scripts/setup.sh index 9f5909c..8fd7fed 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + set -eu test "$(hostname)" = "dom0" || { echo "Must be run from dom0" >&2; exit 1; } @@ -6,6 +11,7 @@ test "$(id -u)" = "0" || exec sudo "${0}" group="qusal" file_roots="/srv/salt/${group}" + ## Avoid having extra unwanted files. rm -rf "${file_roots}" cp -f minion.d/"${group}".conf /etc/salt/minion.d/ diff --git a/scripts/shell-lint.sh b/scripts/shell-lint.sh index b7da0cf..a983c39 100755 --- a/scripts/shell-lint.sh +++ b/scripts/shell-lint.sh @@ -1,4 +1,11 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + +## Credits: https://unix.stackexchange.com/a/483876 + # shellcheck disable=SC2086 set -eu @@ -28,7 +35,6 @@ case "${find_tool}" in files="${files} $(${find_tool} . --max-depth=1 --type=f --extension=sh)" ;; find) - ## https://unix.stackexchange.com/a/483876 files="$(find "${group}"/ -not \( -path "*/zsh" -prune \) -type f -exec sh -c ' case $( file -bi "$1" ) in (*/x-shellscript*) exit 0;; esac exit 1' sh {} \; -print)" diff --git a/scripts/spec-build.sh b/scripts/spec-build.sh index 9cfb0c0..4dbea59 100755 --- a/scripts/spec-build.sh +++ b/scripts/spec-build.sh @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + set -eu command -v dnf >/dev/null || diff --git a/scripts/spec-gen.sh b/scripts/spec-gen.sh index 467d6e5..c1a4b2f 100755 --- a/scripts/spec-gen.sh +++ b/scripts/spec-gen.sh @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + set -eu usage(){ diff --git a/scripts/spec-get.sh b/scripts/spec-get.sh index 589a631..14c08ce 100755 --- a/scripts/spec-get.sh +++ b/scripts/spec-get.sh @@ -1,4 +1,9 @@ #!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC2034 set -eu @@ -54,7 +59,8 @@ if ! test -f "${readme}"; then echo "Project ${name} does not have README.md" >&2 exit 1 fi -license="$(awk '/^License: / {print $2}' "${readme}" | head -1)" +## TODO: no longer working because there might be multiple licenses +license="$(awk '/SPDX-License-Identifier:/ {print $2}' "${readme}" | head -1)" block_max_chars license 70 description="$(sed -n '/^## Description/,/^## /p' "${readme}" | sed '1d;$d' | sed "1{/^$/d}")" diff --git a/scripts/update-toc.sh b/scripts/update-toc.sh new file mode 100755 index 0000000..6454244 --- /dev/null +++ b/scripts/update-toc.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +## SPDX-FileCopyrightText: 2023 Qusal contributors +## +## SPDX-License-Identifier: GPL-3.0-or-later + +## Requires: https://github.com/mzlogin/vim-markdown-toc +set -eu + +for f in "$@"; do + if ! grep -q "^## Table of Contents$" "$f"; then + echo "Could not find table of contents on file: $f" >&2; exit 1 + fi + vim -c 'norm zRgg' -c '/^## Table of Contents$' -c 'norm jd}k' -c ':GenTocGFM' -c 'norm ddgg' -c wq -- "${f}" +done