-
Notifications
You must be signed in to change notification settings - Fork 998
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #23483: edit Foreman license info for GitHub UI
GitHub uses a library called Licensee to identify a project's license type. It shows this information in the status bar and via the API if it can unambiguously identify the license. This commit modifies LICENSE so that it begins with the full text of the GPL 3.0 license. The text that was previously at the beginning of LICENSE has been moved to the relevant section of the README, which has been renamed to "Licensing". At the bottom of the "Licensing" section, there is a note that mentions to the reader that they can reference LICENSE to see the full text of not only the GPL 3.0 license, but also all licenses related to Foreman's dependencies. Collectively, these changes allow Licensee to successfully identify the license type of Foreman as GPL 3.0. Signed-off-by: Andrea Kao <[email protected]>
- Loading branch information
Showing
2 changed files
with
64 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,3 @@ | ||
| The Foreman repository/package is licensed under the GNU GPL v3 or newer, | ||
| with some exceptions. | ||
|
|
||
| Copyright (c) 2009-2016 to Ohad Levy, Paul Kelly and their respective owners. | ||
|
|
||
| All copyright holders for the Foreman project are in the separate file called | ||
| Contributors. | ||
|
|
||
| Except where specified below, this program and entire repository 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 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 [GNU licenses](http://www.gnu.org/licenses/). | ||
|
|
||
| The following files and directories are exceptions: | ||
|
|
||
| * app/views/unattended/ztp/provision.erb is (c) 2013, Juniper Networks under 2-clause BSD license. | ||
| * lib/tasks/convert.rake is (c) 2008, Matson Systems, Inc. under Revised BSD license. | ||
| * extras/noVNC/websockify is (c) 2011, Joel Martin under LGPL v3 license. | ||
| * vendor/assets/fonts/ is (c) 2011-2016, Red Hat Inc. under SIL Open Font License v1.1 or LGPL v2.1 licenses. | ||
| * vendor/assets/javascripts/noVNC/ is (c) 1999 AT&T Laboratories Cambridge, (c) 1996 Widget Workshop, Inc., (c) 1996 Jef Poskanzer <[email protected]>, (c) 2011 Joel Martin, (c) Hiroshi Ichikawa <http://gimite.net/en/>, (c) Martijn Pieters <[email protected]>, Samuel Sieb <[email protected]> under (MPL 1.1 or GPL v2+ or LGPL v2.1+) and LGPL v3 and LGPL v2+ and MIT and Revised BSD licenses. | ||
| * vendor/assets/javascripts/jquery.flot.axislabels.js is (c) 2010 Xuan Luo under MIT license. | ||
| * app/assets/images/RancherOS.png is (c) 2018 Rancher Labs, Inc. | ||
|
|
||
| All rights reserved. | ||
|
|
||
| All the licenses mentioned above now follows: | ||
|
|
||
| ------------------------------------------------------------------------ | ||
|
|
||
| GNU GENERAL PUBLIC LICENSE | ||
| Version 3, 29 June 2007 | ||
|
|
||
|
|
@@ -656,6 +618,43 @@ 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. | ||
|
|
||
| <one line to give the program's name and a brief idea of what it does.> | ||
| Copyright (C) <year> <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 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 <http://www.gnu.org/licenses/>. | ||
| 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: | ||
|
|
||
| <program> Copyright (C) <year> <name of author> | ||
|
|
||
| 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 <http://www.gnu.org/licenses/>. | ||
|
|
||
| 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 <http://www.gnu.org/philosophy/why-not-lgpl.html>. | ||
|
|
||
| ----------------------------------------------------------------------------- | ||
|
|
||
| Revised BSD license | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -80,6 +80,32 @@ We keep a repository of talks, tutorials, articles about everything in the Forem | |
| The original authors of this project are [Ohad Levy](https://github.com/ohadlevy) and [Paul Kelly](https://github.com/pikelly). | ||
| You can find a more thorough list of people who have contributed to this project at some point in [Contributors](Contributors). | ||
|
|
||
| # License | ||
| # Licensing | ||
|
|
||
| See [LICENSE](LICENSE) file. | ||
|
|
||
| The Foreman repository/package is licensed under the GNU GPL v3 or newer, with some exceptions. | ||
|
|
||
| Copyright (c) 2009-2018 to Ohad Levy, Paul Kelly and their respective owners. | ||
|
|
||
| All copyright holders for the Foreman project are in the separate file called Contributors. | ||
|
|
||
| Except where specified below, this program and entire repository 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 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 [GNU licenses](http://www.gnu.org/licenses/). | ||
|
|
||
| The following files and directories are exceptions: | ||
|
|
||
| * app/views/unattended/ztp/provision.erb is (c) 2013, Juniper Networks under 2-clause BSD license. | ||
| * lib/tasks/convert.rake is (c) 2008, Matson Systems, Inc. under Revised BSD license. | ||
| * extras/noVNC/websockify is (c) 2011, Joel Martin under LGPL v3 license. | ||
| * vendor/assets/fonts/ is (c) 2011-2016, Red Hat Inc. under SIL Open Font License v1.1 or LGPL v2.1 licenses. | ||
| * vendor/assets/javascripts/noVNC/ is (c) 1999 AT&T Laboratories Cambridge, (c) 1996 Widget Workshop, Inc., (c) 1996 Jef Poskanzer <[email protected]>, (c) 2011 Joel Martin, (c) Hiroshi Ichikawa <http://gimite.net/en/>, (c) Martijn Pieters <[email protected]>, Samuel Sieb <[email protected]> under (MPL 1.1 or GPL v2+ or LGPL v2.1+) and LGPL v3 and LGPL v2+ and MIT and Revised BSD licenses. | ||
| * vendor/assets/javascripts/jquery.flot.axislabels.js is (c) 2010 Xuan Luo under MIT license. | ||
| * app/assets/images/RancherOS.png is (c) 2018 Rancher Labs, Inc. | ||
|
|
||
| All rights reserved. | ||
|
|
||
| The [LICENSE](LICENSE) file contains the full text of the GNU GPL v3 license, along with the text for all additional licenses referenced above. | ||