From 68b0e13991b97e49e6f14f9267f0de057c1637af Mon Sep 17 00:00:00 2001 From: capruro <64908287+capruro@users.noreply.github.com> Date: Sun, 13 Dec 2020 13:54:43 +0100 Subject: [PATCH 1/3] Update to 1.6.2 --- ext/installfiles/linux/zerotier-containerized/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/installfiles/linux/zerotier-containerized/Dockerfile b/ext/installfiles/linux/zerotier-containerized/Dockerfile index 3d580566c..0e3f0744d 100644 --- a/ext/installfiles/linux/zerotier-containerized/Dockerfile +++ b/ext/installfiles/linux/zerotier-containerized/Dockerfile @@ -7,11 +7,11 @@ FROM debian:buster-slim as builder RUN apt-get update && apt-get install -y curl gnupg RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 0x1657198823e52a61 && \ echo "deb http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list -RUN apt-get update && apt-get install -y zerotier-one=1.4.4 +RUN apt-get update && apt-get install -y zerotier-one=1.6.2 COPY ext/installfiles/linux/zerotier-containerized/main.sh /var/lib/zerotier-one/main.sh FROM debian:buster-slim -LABEL version="1.4.4" +LABEL version="1.6.2" LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts." # ZeroTier relies on UDP port 9993 From 4944d044cefb60f90a4145d59450a2c142d82256 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Sun, 20 Dec 2020 17:12:34 +0800 Subject: [PATCH 2/3] README: Minor format fixes --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f4ae216ee..406ae3193 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Visit [ZeroTier's site](https://www.zerotier.com/) for more information and [pre ZeroTier is licensed under the [BSL version 1.1](https://mariadb.com/bsl11/). See [LICENSE.txt](LICENSE.txt) and the [ZeroTier pricing page](https://www.zerotier.com/pricing) for details. ZeroTier is free to use internally in businesses and academic institutions and for non-commercial purposes. Certain types of commercial use such as building closed-source apps and devices based on ZeroTier or offering ZeroTier network controllers and network management as a SaaS service require a commercial license. -A small amount of third party code is also included in ZeroTier and is not subject to our BSL license. See [AUTHORS.md] for a list of third party code, where it is included, and the licenses that apply to it. All of the third party code in ZeroTier is liberally licensed (MIT, BSD, Apache, public domain, etc.). +A small amount of third party code is also included in ZeroTier and is not subject to our BSL license. See [AUTHORS.md](AUTHORS.md) for a list of third party code, where it is included, and the licenses that apply to it. All of the third party code in ZeroTier is liberally licensed (MIT, BSD, Apache, public domain, etc.). ### Getting Started @@ -44,7 +44,7 @@ The base path contains the ZeroTier One service main entry point (`one.cpp`), se ### Build and Platform Notes -To build on Mac and Linux just type `make`. On FreeBSD and OpenBSD `gmake` (GNU make) is required and can be installed from packages or ports. For Windows there is a Visual Studio solution in `windows/'. +To build on Mac and Linux just type `make`. On FreeBSD and OpenBSD `gmake` (GNU make) is required and can be installed from packages or ports. For Windows there is a Visual Studio solution in `windows/`. - **Mac** - Xcode command line tools for OSX 10.8 or newer are required. @@ -64,7 +64,7 @@ Typing `make selftest` will build a *zerotier-selftest* binary which unit tests ### Running -Running *zerotier-one* with -h will show help. +Running *zerotier-one* with `-h` option will show help. On Linux and BSD you can start the service with: @@ -72,7 +72,7 @@ On Linux and BSD you can start the service with: A home folder for your system will automatically be created. -The service is controlled via the JSON API, which by default is available at 127.0.0.1 port 9993. We include a *zerotier-cli* command line utility to make API calls for standard things like joining and leaving networks. The *authtoken.secret* file in the home folder contains the secret token for accessing this API. See README.md in [service/](service/) for API documentation. +The service is controlled via the JSON API, which by default is available at 127.0.0.1 port 9993. We include a *zerotier-cli* command line utility to make API calls for standard things like joining and leaving networks. The *authtoken.secret* file in the home folder contains the secret token for accessing this API. See [service/README.md](service/README.md) for API documentation. Here's where home folders live (by default) on each OS: @@ -105,4 +105,4 @@ Users behind certain types of firewalls and "symmetric" NAT devices may not able If a firewall between you and the Internet blocks ZeroTier's UDP traffic, you will fall back to last-resort TCP tunneling to rootservers over port 443 (https impersonation). This will work almost anywhere but is *very slow* compared to UDP or direct peer to peer connectivity. -Additional help [can be found in our knowledge base](https://zerotier.atlassian.net/wiki/spaces/SD/overview). +Additional help can be found in our [knowledge base](https://zerotier.atlassian.net/wiki/spaces/SD/overview). From 3a6cc1d8b76e3e510cb0a67f7a93ec67496c6d4f Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Wed, 13 Jan 2021 18:07:58 +0100 Subject: [PATCH 3/3] .github: Fix typo in bug report template --- .github/ISSUE_TEMPLATE/bugs-and-issues.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bugs-and-issues.md b/.github/ISSUE_TEMPLATE/bugs-and-issues.md index 8f1103b3c..37483a8dd 100644 --- a/.github/ISSUE_TEMPLATE/bugs-and-issues.md +++ b/.github/ISSUE_TEMPLATE/bugs-and-issues.md @@ -12,7 +12,7 @@ assignees: '' _Using these will ensure you get quicker support, and make this space available for code-related issues. Thank you!_ - [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview) => Guides and documentation on how to use ZeroTier. -- [Discuss Forum](https://discuss.zerotier.com/) => Our discussion forum for users and support to mutally resolve issues & suggest ideas. +- [Discuss Forum](https://discuss.zerotier.com/) => Our discussion forum for users and support to mutually resolve issues & suggest ideas. - [Reddit](https://www.reddit.com/r/zerotier/) => Our subreddit, which we monitor regularly and is fairly active. - https://www.zerotier.com/contact/ => Sales and licensing queries - https://zerotier.atlassian.net/servicedesk/customer/portals => Customer Support Portal