From b7389995f4003a2c1d1bb6b6ce9171be08565f6d Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 7 Aug 2014 06:25:01 -0700 Subject: [PATCH] Make install scripts also symlink zerotier-idtool script, and doc updates. --- ext/installfiles/linux/install.tmpl.sh | 3 ++- ext/installfiles/mac/install.tmpl.sh | 3 ++- topology/README.md | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ext/installfiles/linux/install.tmpl.sh b/ext/installfiles/linux/install.tmpl.sh index 3968b2643..c82400dd0 100644 --- a/ext/installfiles/linux/install.tmpl.sh +++ b/ext/installfiles/linux/install.tmpl.sh @@ -77,8 +77,9 @@ fi echo 'Installing zerotier-cli command line utility...' -rm -f /usr/bin/zerotier-cli +rm -f /usr/bin/zerotier-cli /usr/bin/zerotier-idtool ln -sf /var/lib/zerotier-one/zerotier-one /usr/bin/zerotier-cli +ln -sf /var/lib/zerotier-one/zerotier-one /usr/bin/zerotier-idtool echo 'Installing and (re-)starting zerotier-one daemon...' diff --git a/ext/installfiles/mac/install.tmpl.sh b/ext/installfiles/mac/install.tmpl.sh index c0484baa3..d0c7efe1b 100644 --- a/ext/installfiles/mac/install.tmpl.sh +++ b/ext/installfiles/mac/install.tmpl.sh @@ -109,8 +109,9 @@ ln -sf "$ztapp/Contents/Info.plist" "$zthome/shutdownIfUnreadable" echo 'Installing zerotier-cli command line utility...' -rm -f /usr/bin/zerotier-cli +rm -f /usr/bin/zerotier-cli /usr/bin/zerotier-idtool ln -sf "/Library/Application Support/ZeroTier/One/zerotier-one" /usr/bin/zerotier-cli +ln -sf "/Library/Application Support/ZeroTier/One/zerotier-one" /usr/bin/zerotier-idtool # This lets the install helper AppleScript thingy go ahead and authorize the # user after the installer is done, skiping that step for the user who did diff --git a/topology/README.md b/topology/README.md index 341acdadd..69ec3fc73 100644 --- a/topology/README.md +++ b/topology/README.md @@ -1,9 +1,9 @@ -This folder contains the source files to compile the signed network topology dictionary. -Users outside ZeroTier won't find this useful except for documentation purposes, since -this dictionary must be signed by a valid topology signing key to be considered valid. These -keys are hard-coded into the source and distributed with all versions of the app. +This folder contains the source files to compile the signed network topology dictionary. Users outside ZeroTier won't find this useful except for documentation purposes, since this dictionary must be signed by a valid topology signing key to be considered valid. These keys are hard-coded into the source and distributed with all versions of the app. -A default value for this dictionary is included in node/Defaults.cpp, and the following -URL is periodically checked for updates: +A default value for this dictionary is included in node/Defaults.cpp, and the following URL is periodically checked for updates: http://download.zerotier.com/sys/topology + +Obviously nothing prevents OSS users from replacing this topology with their own, changing the hard coded topology signing identity and update URL in Defaults, and signing their own dictionary. But doing so would yield a network that would have a tough(ish) time talking to the main one. Since the main network is a free service, why bother? (Except for building testnets, which ZeroTier already does for internal testing.) + +Increasing decentralization via federation or trust network is possible in the future though, provided it can be done without sacrificing stability, security, performance, or ease of use.