From e3c99636c5f38ef9374bd6d5ae81956db58354de Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Mon, 6 Nov 2017 11:08:33 -0700 Subject: [PATCH] add standard files --- CHANGELOG | 5 +++++ LICENSE | 41 +++++++++++++++++++++++++++++++++++++++++ LICENSE.txt | 3 --- package.json | 6 +++--- 4 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 CHANGELOG create mode 100644 LICENSE delete mode 100644 LICENSE.txt diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..fe84a7f --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,5 @@ +v1.1.3 - Better late than never... here's some stuff we've got + * fixed (probably) network settings not being readable + * supports timeouts in loopback check + * loopback check less likely to fail / throw errors, will try again + * supports ddns using audience of token diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6297ea2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,41 @@ +Copyright 2017 Daplie, Inc + +This is open source software; you can redistribute it and/or modify it under the +terms of either: + + a) the "MIT License" + b) the "Apache-2.0 License" + +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. + +Apache-2.0 License Summary + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 8ef1ecc..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,3 +0,0 @@ -Hello all. We make our source code available to view, but we retain copyright. - -It's not because we're trying to be mean or anything, we just want to maintain our distribution channel. diff --git a/package.json b/package.json index 20387c8..2cd1c2c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "goldilocks", - "version": "1.0.0-placeholder", + "version": "1.1.3", "description": "The node.js webserver that's just right, Greenlock (HTTPS/TLS/SSL via ACME/Let's Encrypt) and tunneling (RVPN) included.", "main": "bin/goldilocks.js", "repository": { @@ -8,7 +8,7 @@ "url": "git@git.daplie.com:Daplie/goldilocks.js.git" }, "author": "AJ ONeal (https://daplie.com/)", - "license": "SEE LICENSE IN LICENSE.txt", + "license": "(MIT OR Apache-2.0)", "scripts": { "test": "node bin/goldilocks.js -p 8443 -d /tmp/" }, @@ -36,7 +36,7 @@ "bugs": { "url": "https://git.daplie.com/Daplie/server-https/issues" }, - "homepage": "https://git.daplie.com/Daplie/goldilocks.js#readme", + "homepage": "https://git.daplie.com/Daplie/goldilocks.js", "dependencies": { "bluebird": "^3.4.6", "body-parser": "git+https://github.com/expressjs/body-parser.git#1.16.1",