diff --git a/.gitignore b/.gitignore index 8f32933..7d20a79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Files and data directories created by services # that we shouldn't accidently commit diff --git a/LICENSE b/LICENSE index 1bde8d5..f288702 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 + 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 @@ -7,15 +7,17 @@ Preamble - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. + The 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, -our General Public Licenses are intended to guarantee your freedom to +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. +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 @@ -24,34 +26,44 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. + 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. - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. + 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. - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. + 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. - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. + 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. @@ -60,7 +72,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU Affero General Public License. + "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. @@ -537,45 +549,35 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. + 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 General Public License into a single +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 work with which it is combined will remain governed by version -3 of the GNU General Public License. +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 Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to +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 Affero General +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 Affero General Public License, you may choose any version ever published +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 Affero General Public License can be used, that proxy's +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. @@ -630,32 +632,43 @@ 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) 2021 + Copyright (C) This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or + 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 Affero General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License + 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 your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. + 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 AGPL, see +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/README.md b/README.md index 666f668..fbd5645 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

diff --git a/app-standard-v1.json.license b/app-standard-v1.json.license index 4551d97..f0626d9 100644 --- a/app-standard-v1.json.license +++ b/app-standard-v1.json.license @@ -1,3 +1,3 @@ -SPDX-FileCopyrightText: 2021 Aaron Dewes +SPDX-FileCopyrightText: 2021 Citadel and contributors -SPDX-License-Identifier: AGPL-3.0-or-later \ No newline at end of file +SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/app-system/docker-compose.common.yml b/app-system/docker-compose.common.yml index dddc9ca..0d366a8 100644 --- a/app-system/docker-compose.common.yml +++ b/app-system/docker-compose.common.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later version: "3.8" diff --git a/app-system/sources.list b/app-system/sources.list index 2e64a89..f0de1c0 100644 --- a/app-system/sources.list +++ b/app-system/sources.list @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # A collection of fully FLOSS app definitions and FLOSS apps for Citadel. https://github.com/runcitadel/apps main diff --git a/app/app-manager.py b/app/app-manager.py index 1bf56a8..7bb9a36 100755 --- a/app/app-manager.py +++ b/app/app-manager.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import json from lib.manage import compose, createDataDir, deleteData, getUserData, setInstalled, setRemoved, startInstalled, stopInstalled, update, deriveEntropy, updateRepos diff --git a/app/lib/__init__.py b/app/lib/__init__.py index 364fef7..9a1e34e 100644 --- a/app/lib/__init__.py +++ b/app/lib/__init__.py @@ -1,3 +1,3 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later \ No newline at end of file +# SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/app/lib/citadelutils.py b/app/lib/citadelutils.py index d383d61..fb710a7 100644 --- a/app/lib/citadelutils.py +++ b/app/lib/citadelutils.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import re diff --git a/app/lib/composegenerator/shared/const.py b/app/lib/composegenerator/shared/const.py index 7021215..82935d6 100644 --- a/app/lib/composegenerator/shared/const.py +++ b/app/lib/composegenerator/shared/const.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later def permissions(): return { diff --git a/app/lib/composegenerator/shared/env.py b/app/lib/composegenerator/shared/env.py index 1ce204d..43be813 100644 --- a/app/lib/composegenerator/shared/env.py +++ b/app/lib/composegenerator/shared/env.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import re from typing import Union diff --git a/app/lib/composegenerator/shared/main.py b/app/lib/composegenerator/shared/main.py index 66055bc..79e04a9 100644 --- a/app/lib/composegenerator/shared/main.py +++ b/app/lib/composegenerator/shared/main.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Main functions from lib.composegenerator.v1.types import App, AppStage3, AppStage2, Container diff --git a/app/lib/composegenerator/v1/generate.py b/app/lib/composegenerator/v1/generate.py index a840888..b06981a 100644 --- a/app/lib/composegenerator/v1/generate.py +++ b/app/lib/composegenerator/v1/generate.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later from lib.composegenerator.v1.types import App, AppStage4, generateApp from lib.composegenerator.v1.networking import configureHiddenServices, configureIps, configureMainPort diff --git a/app/lib/composegenerator/v1/networking.py b/app/lib/composegenerator/v1/networking.py index c87ee17..77aa452 100644 --- a/app/lib/composegenerator/v1/networking.py +++ b/app/lib/composegenerator/v1/networking.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later from dacite import from_dict from lib.composegenerator.v1.types import AppStage2, AppStage3, ContainerStage2, NetworkConfig diff --git a/app/lib/composegenerator/v1/utils/networking.py b/app/lib/composegenerator/v1/utils/networking.py index 8dc2ec7..7f25285 100644 --- a/app/lib/composegenerator/v1/utils/networking.py +++ b/app/lib/composegenerator/v1/utils/networking.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import json import os diff --git a/app/lib/entropy.py b/app/lib/entropy.py index 01a0449..3d3f4ac 100644 --- a/app/lib/entropy.py +++ b/app/lib/entropy.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import os import subprocess diff --git a/app/lib/manage.py b/app/lib/manage.py index 941014f..f6bc5f9 100644 --- a/app/lib/manage.py +++ b/app/lib/manage.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import stat import tempfile diff --git a/app/lib/metadata.py b/app/lib/metadata.py index 521aa5b..b44943c 100644 --- a/app/lib/metadata.py +++ b/app/lib/metadata.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import os import yaml diff --git a/app/lib/validate.py b/app/lib/validate.py index 10ec6e5..0744e80 100644 --- a/app/lib/validate.py +++ b/app/lib/validate.py @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import os import yaml diff --git a/bin/bitcoin-cli b/bin/bitcoin-cli index c1c3f59..6d90b16 100755 --- a/bin/bitcoin-cli +++ b/bin/bitcoin-cli @@ -4,7 +4,7 @@ # SPDX-FileCopyrightText: 2021 Aaron Dewes # SPDX-FileCopyrightText: 2021 https://github.com/o3o3o # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/bin/lncli b/bin/lncli index 4f90a7a..b37e332 100755 --- a/bin/lncli +++ b/bin/lncli @@ -4,7 +4,7 @@ # SPDX-FileCopyrightText: 2021 Aaron Dewes # SPDX-FileCopyrightText: 2021 https://github.com/o3o3o # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/events/triggers/app b/events/triggers/app index a074ef6..7d9df05 100755 --- a/events/triggers/app +++ b/events/triggers/app @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)" diff --git a/events/triggers/app-update b/events/triggers/app-update index 9c428bc..7780512 100755 --- a/events/triggers/app-update +++ b/events/triggers/app-update @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)" diff --git a/events/triggers/backup b/events/triggers/backup index f7fac2f..3c2bdd8 100755 --- a/events/triggers/backup +++ b/events/triggers/backup @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)" diff --git a/events/triggers/change-password b/events/triggers/change-password index 2bc7776..0fd5a09 100755 --- a/events/triggers/change-password +++ b/events/triggers/change-password @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Aaron Dewes # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)" diff --git a/events/triggers/debug b/events/triggers/debug index f0bca69..4dc7c8b 100755 --- a/events/triggers/debug +++ b/events/triggers/debug @@ -1,8 +1,8 @@ #!/usr/bin/env bash -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later NODE_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)" RESULT_FILE="${NODE_ROOT}/statuses/debug-status.json" diff --git a/events/triggers/reboot b/events/triggers/reboot index eb7e119..0969443 100755 --- a/events/triggers/reboot +++ b/events/triggers/reboot @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/events/triggers/shutdown b/events/triggers/shutdown index ff99315..f02b13d 100755 --- a/events/triggers/shutdown +++ b/events/triggers/shutdown @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/events/triggers/update b/events/triggers/update index b61b76c..180b95e 100755 --- a/events/triggers/update +++ b/events/triggers/update @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)" diff --git a/info.json.license b/info.json.license index cba21c8..c8cd663 100644 --- a/info.json.license +++ b/info.json.license @@ -1,3 +1,3 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later \ No newline at end of file +# SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/karen b/karen index 669174e..575d417 100755 --- a/karen +++ b/karen @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors. # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # karen watches for signals and executes triggers in the events dir # karen gets triggered a lot diff --git a/scripts/app b/scripts/app index 2911a31..1dedaca 100755 --- a/scripts/app +++ b/scripts/app @@ -1,8 +1,8 @@ #!/usr/bin/env bash -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later NODE_ROOT="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))/.." diff --git a/scripts/backup/README.md b/scripts/backup/README.md index 32a3559..9a4ef45 100644 --- a/scripts/backup/README.md +++ b/scripts/backup/README.md @@ -1,7 +1,7 @@ # Automatic Encrypted Backups diff --git a/scripts/backup/backup b/scripts/backup/backup index ea5a1ce..8f3a85b 100755 --- a/scripts/backup/backup +++ b/scripts/backup/backup @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/backup/decoy-trigger b/scripts/backup/decoy-trigger index 93a5ef7..9d0465b 100755 --- a/scripts/backup/decoy-trigger +++ b/scripts/backup/decoy-trigger @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/backup/monitor b/scripts/backup/monitor index 67ac8fb..5234ac9 100755 --- a/scripts/backup/monitor +++ b/scripts/backup/monitor @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later check_root () { if [[ $UID != 0 ]]; then diff --git a/scripts/citadel-os/change-password b/scripts/citadel-os/change-password index 73b9544..273b8d9 100755 --- a/scripts/citadel-os/change-password +++ b/scripts/citadel-os/change-password @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Aaron Dewes # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/citadel-os/citadel-details b/scripts/citadel-os/citadel-details index baf9825..1263a08 100755 --- a/scripts/citadel-os/citadel-details +++ b/scripts/citadel-os/citadel-details @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import sys import os diff --git a/scripts/citadel-os/external-storage/monitor b/scripts/citadel-os/external-storage/monitor index 5653c4a..6991d35 100755 --- a/scripts/citadel-os/external-storage/monitor +++ b/scripts/citadel-os/external-storage/monitor @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Aaron Dewes # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/citadel-os/external-storage/mount b/scripts/citadel-os/external-storage/mount index 4d6e3a7..e315206 100755 --- a/scripts/citadel-os/external-storage/mount +++ b/scripts/citadel-os/external-storage/mount @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Aaron Dewes # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/citadel-os/external-storage/update-from-sdcard b/scripts/citadel-os/external-storage/update-from-sdcard index e86f4a0..d6d0719 100755 --- a/scripts/citadel-os/external-storage/update-from-sdcard +++ b/scripts/citadel-os/external-storage/update-from-sdcard @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Aaron Dewes # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/citadel-os/semver b/scripts/citadel-os/semver index e73077c..648b0ce 100755 --- a/scripts/citadel-os/semver +++ b/scripts/citadel-os/semver @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # # SPDX-FileCopyrightText: Copyright (c) 2014 Józef Sokołowski diff --git a/scripts/citadel-os/services/citadel-connection-details.service b/scripts/citadel-os/services/citadel-connection-details.service index 735e9fb..90e820a 100644 --- a/scripts/citadel-os/services/citadel-connection-details.service +++ b/scripts/citadel-os/services/citadel-connection-details.service @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Citadel Connection Details Logger (TTY) # Installed at /etc/systemd/system/citadel-connection-details.service diff --git a/scripts/citadel-os/services/citadel-external-storage-sdcard-update.service b/scripts/citadel-os/services/citadel-external-storage-sdcard-update.service index 64f85ad..c37f1cd 100644 --- a/scripts/citadel-os/services/citadel-external-storage-sdcard-update.service +++ b/scripts/citadel-os/services/citadel-external-storage-sdcard-update.service @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Citadel External Storage SDcard Updater # Installed at /etc/systemd/system/citadel-external-storage-sdcard-update.service diff --git a/scripts/citadel-os/services/citadel-external-storage.service b/scripts/citadel-os/services/citadel-external-storage.service index 952de07..51b252a 100644 --- a/scripts/citadel-os/services/citadel-external-storage.service +++ b/scripts/citadel-os/services/citadel-external-storage.service @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Citadel External Storage Mounter # Installed at /etc/systemd/system/citadel-external-storage.service diff --git a/scripts/citadel-os/services/citadel-startup.service b/scripts/citadel-os/services/citadel-startup.service index b247cf1..be33a98 100644 --- a/scripts/citadel-os/services/citadel-startup.service +++ b/scripts/citadel-os/services/citadel-startup.service @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Citadel Startup Service # Installed at /etc/systemd/system/citadel-startup.service diff --git a/scripts/configure b/scripts/configure index 716870f..4b68fa6 100755 --- a/scripts/configure +++ b/scripts/configure @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import sys import os diff --git a/scripts/debug b/scripts/debug index eb5e9b5..0f565aa 100755 --- a/scripts/debug +++ b/scripts/debug @@ -1,8 +1,8 @@ #!/usr/bin/env bash -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later NODE_ROOT="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))/.." cd "${NODE_ROOT}" diff --git a/scripts/lib/rpcauth.py b/scripts/lib/rpcauth.py index eac32f4..394d17f 100644 --- a/scripts/lib/rpcauth.py +++ b/scripts/lib/rpcauth.py @@ -4,7 +4,7 @@ # SPDX-FileCopyrightText: 2015-2018 The Bitcoin Core developers # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later from argparse import ArgumentParser from base64 import urlsafe_b64encode diff --git a/scripts/memory-usage b/scripts/memory-usage index bd41e99..4afbaa6 100755 --- a/scripts/memory-usage +++ b/scripts/memory-usage @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-FileCopyrightText: 2020 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)" diff --git a/scripts/start b/scripts/start index 4ea0566..bdb535e 100755 --- a/scripts/start +++ b/scripts/start @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/status-monitor b/scripts/status-monitor index 7131a78..05358eb 100755 --- a/scripts/status-monitor +++ b/scripts/status-monitor @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)" diff --git a/scripts/status/memory b/scripts/status/memory index e7653b4..2876479 100755 --- a/scripts/status/memory +++ b/scripts/status/memory @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)" diff --git a/scripts/status/storage b/scripts/status/storage index 9e1a2d0..9952f50 100755 --- a/scripts/status/storage +++ b/scripts/status/storage @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)" diff --git a/scripts/status/temperature b/scripts/status/temperature index ed9c891..9055717 100755 --- a/scripts/status/temperature +++ b/scripts/status/temperature @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # If vcgencmd is available, use it to get the temperature and exit if command -v vcgencmd &> /dev/null; then diff --git a/scripts/status/uptime b/scripts/status/uptime index cb33614..3bef494 100755 --- a/scripts/status/uptime +++ b/scripts/status/uptime @@ -2,6 +2,6 @@ # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later cat /proc/uptime | awk '{print int($1)}' diff --git a/scripts/stop b/scripts/stop index d1e2b7c..21a43c4 100755 --- a/scripts/stop +++ b/scripts/stop @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/update/.updateignore.license b/scripts/update/.updateignore.license index 19edadc..d6c3a22 100644 --- a/scripts/update/.updateignore.license +++ b/scripts/update/.updateignore.license @@ -1,4 +1,4 @@ SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com SPDX-FileCopyrightText: 2021 Citadel and contributors. -SPDX-License-Identifier: AGPL-3.0-or-later \ No newline at end of file +SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/scripts/update/.updateinclude.license b/scripts/update/.updateinclude.license index 19edadc..d6c3a22 100644 --- a/scripts/update/.updateinclude.license +++ b/scripts/update/.updateinclude.license @@ -1,4 +1,4 @@ SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com SPDX-FileCopyrightText: 2021 Citadel and contributors. -SPDX-License-Identifier: AGPL-3.0-or-later \ No newline at end of file +SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/scripts/update/00-run.sh b/scripts/update/00-run.sh index b43d379..da19715 100755 --- a/scripts/update/00-run.sh +++ b/scripts/update/00-run.sh @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/update/01-run.sh b/scripts/update/01-run.sh index 0edbaed..194a20c 100755 --- a/scripts/update/01-run.sh +++ b/scripts/update/01-run.sh @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/update/02-run.sh b/scripts/update/02-run.sh index c8d4ea6..4211041 100755 --- a/scripts/update/02-run.sh +++ b/scripts/update/02-run.sh @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/update/03-run.sh b/scripts/update/03-run.sh index f1aebb4..24d0d58 100755 --- a/scripts/update/03-run.sh +++ b/scripts/update/03-run.sh @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later set -euo pipefail diff --git a/scripts/update/README.md b/scripts/update/README.md index 78d3e79..55e15f8 100644 --- a/scripts/update/README.md +++ b/scripts/update/README.md @@ -1,7 +1,7 @@ # Over-The-Air (OTA) Updates diff --git a/scripts/update/update b/scripts/update/update index c240a73..2b515d9 100755 --- a/scripts/update/update +++ b/scripts/update/update @@ -3,7 +3,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later if [[ $UID != 0 ]]; then echo "Update script must be run as root" diff --git a/services/electrs.yml b/services/electrs.yml index a610a54..fafebdd 100644 --- a/services/electrs.yml +++ b/services/electrs.yml @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later electrs: container_name: electrs diff --git a/services/manage.py b/services/manage.py index 061c89a..bf01fa7 100755 --- a/services/manage.py +++ b/services/manage.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later import json from typing import List diff --git a/setenv b/setenv index 1f20355..f0edaa1 100644 --- a/setenv +++ b/setenv @@ -1,8 +1,8 @@ #!/usr/bin/env bash -# SPDX-FileCopyrightText: 2021 Aaron Dewes +# SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later CITADEL_ROOT="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))" diff --git a/statuses/password.license b/statuses/password.license index 864d85f..3dbc0fa 100644 --- a/statuses/password.license +++ b/statuses/password.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2020 Aaron Dewes -SPDX-License-Identifier: AGPL-3.0-or-later \ No newline at end of file +SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/statuses/update-status.json.license b/statuses/update-status.json.license index 783617a..8e9027e 100644 --- a/statuses/update-status.json.license +++ b/statuses/update-status.json.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com -SPDX-License-Identifier: AGPL-3.0-or-later \ No newline at end of file +SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/templates/.env-sample b/templates/.env-sample index b18a740..cc9d81b 100644 --- a/templates/.env-sample +++ b/templates/.env-sample @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors. # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Citadel Core NETWORK_IP= diff --git a/templates/bitcoin-sample.conf b/templates/bitcoin-sample.conf index a53a8a1..f3fd8fc 100644 --- a/templates/bitcoin-sample.conf +++ b/templates/bitcoin-sample.conf @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Please note: This file can't be changed, it will be overwritten. # Tor diff --git a/templates/electrs-sample.toml b/templates/electrs-sample.toml index 4ba5b43..1dc92ad 100644 --- a/templates/electrs-sample.toml +++ b/templates/electrs-sample.toml @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors. # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Please note: This file can't be changed, it will be overwritten. # A few modifications will be kept, including alias, color, channel size limitations and more if you contact us. diff --git a/templates/lnd-sample.conf b/templates/lnd-sample.conf index 37fe846..99112bd 100644 --- a/templates/lnd-sample.conf +++ b/templates/lnd-sample.conf @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors. # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Please note: This file can't be changed, it will be overwritten. # A few modifications will be kept, including alias, color, channel size limitations and more if you contact us. diff --git a/templates/nginx-sample.conf b/templates/nginx-sample.conf index 3c93f99..d990d9d 100644 --- a/templates/nginx-sample.conf +++ b/templates/nginx-sample.conf @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later user nginx; worker_processes 1; diff --git a/templates/torrc-core-sample b/templates/torrc-core-sample index 1da1e8a..84931fc 100644 --- a/templates/torrc-core-sample +++ b/templates/torrc-core-sample @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2020 Umbrel. https://getumbrel.com # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later # Bind only to "" which is the tor IP within the container SocksPort : diff --git a/templates/torrc-empty b/templates/torrc-empty index bc5ceab..66ae4e3 100644 --- a/templates/torrc-empty +++ b/templates/torrc-empty @@ -1,4 +1,4 @@ # SPDX-FileCopyrightText: 2021 Citadel and contributors # -# SPDX-License-Identifier: AGPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/walletpassword.license b/walletpassword.license index 4551d97..f0626d9 100644 --- a/walletpassword.license +++ b/walletpassword.license @@ -1,3 +1,3 @@ -SPDX-FileCopyrightText: 2021 Aaron Dewes +SPDX-FileCopyrightText: 2021 Citadel and contributors -SPDX-License-Identifier: AGPL-3.0-or-later \ No newline at end of file +SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file