diff options
author | Francois Marier <francois@mozilla.com> | 2015-11-24 01:57:21 +0300 |
---|---|---|
committer | Francois Marier <francois@mozilla.com> | 2015-11-24 01:58:37 +0300 |
commit | 651dbd12cc67d618e9d76e32d2eb92bb65715496 (patch) | |
tree | d66fbbdd27cf865cfe29bddc1bc1c52f78c0a8cb /LICENSE.txt | |
parent | f504b0622d2d20288ea479750a5166c0a3fa8788 (diff) |
Clarify the part of letsencrypt that uses nginxparser
Diffstat (limited to 'LICENSE.txt')
-rw-r--r-- | LICENSE.txt | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index 1a89cd8d9..5965ec2ef 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -2,6 +2,13 @@ Let's Encrypt Python Client Copyright (c) Electronic Frontier Foundation and others Licensed Apache Version 2.0 +The nginx plugin incorporates code from nginxparser +Copyright (c) 2014 Fatih Erikli +Licensed MIT + + +Text of Apache License +====================== Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -177,4 +184,22 @@ Licensed Apache Version 2.0 incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - END OF TERMS AND CONDITIONS + +Text of MIT License +=================== +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |