diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-07-29 10:21:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 10:21:35 -0700 |
| commit | 745483708acf13a86889c18a83343c5f12d4a653 (patch) | |
| tree | 1b95bead00082cc0b6599160ab282e389d5cdeb5 | |
| parent | d9432f2f1eccb624d772f532d514f9d74f0dc98c (diff) | |
| parent | eb2f851e6557812a4549788bf9ce03256dcef67b (diff) | |
| download | infinitytier-745483708acf13a86889c18a83343c5f12d4a653.tar.gz infinitytier-745483708acf13a86889c18a83343c5f12d4a653.zip | |
Merge pull request #974 from squeakbat/master
Don't relink zerotier-one every time.
| -rw-r--r-- | .github/ISSUE_TEMPLATE/bug_report.md | 2 | ||||
| -rw-r--r-- | make-linux.mk | 16 | ||||
| -rw-r--r-- | service/README.md | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 60f96888..92a26742 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -6,7 +6,7 @@ about: Create a report to help us improve **Alternative, faster ways to get help** If you have just started using ZeroTier, here are some places to get help: - my.zerotier.com has a _Community_ tab. It's a live chat with other users and the developers. -- [ZeroTier Knowledge Base](https://support.zerotier.com/knowledgebase.php?s=MQ__) +- [ZeroTier Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview) - www.zerotier.com has a Contact Us button - email contact@zerotier.com diff --git a/make-linux.mk b/make-linux.mk index b777f67e..d18126c9 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -283,19 +283,21 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1) override CORE_OBJS+=ext/arm32-neon-salsa2012-asm/salsa2012.o endif +.PHONY: all all: one -one: $(CORE_OBJS) $(ONE_OBJS) one.o +.PHONY: one +one: zerotier-one zerotier-idtool zerotier-cli + +zerotier-one: $(CORE_OBJS) $(ONE_OBJS) one.o $(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LDLIBS) $(STRIP) zerotier-one - ln -sf zerotier-one zerotier-idtool - ln -sf zerotier-one zerotier-cli -zerotier-one: one - -zerotier-idtool: one +zerotier-idtool: zerotier-one + ln -sf zerotier-one zerotier-idtool -zerotier-cli: one +zerotier-cli: zerotier-one + ln -sf zerotier-one zerotier-cli libzerotiercore.a: FORCE make CFLAGS="-O3 -fstack-protector -fPIC" CXXFLAGS="-O3 -std=c++11 -fstack-protector -fPIC" $(CORE_OBJS) diff --git a/service/README.md b/service/README.md index 08a3a63f..c77ee511 100644 --- a/service/README.md +++ b/service/README.md @@ -5,7 +5,7 @@ This is the actual implementation of ZeroTier One, a service providing connectiv ### Local Configuration File -A file called `local.conf` in the ZeroTier home folder contains configuration options that apply to the local node. It can be used to set up trusted paths, blacklist physical paths, set up physical path hints for certain nodes, and define trusted upstream devices (federated roots). In a large deployment it can be deployed using a tool like Puppet, Chef, SaltStack, etc. to set a uniform configuration across systems. It's a JSON format file that can also be edited and rewritten by ZeroTier One itself, so ensure that proper JSON formatting is used. +A file called `local.conf` in the ZeroTier home folder contains configuration options that apply to the local node. (It does not exist unless you create it). It can be used to set up trusted paths, blacklist physical paths, set up physical path hints for certain nodes, and define trusted upstream devices (federated roots). In a large deployment it can be deployed using a tool like Puppet, Chef, SaltStack, etc. to set a uniform configuration across systems. It's a JSON format file that can also be edited and rewritten by ZeroTier One itself, so ensure that proper JSON formatting is used. Settings available in `local.conf` (this is not valid JSON, and JSON does not allow comments): |