summaryrefslogtreecommitdiff
path: root/service/README.md
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-03-14 21:21:12 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-03-14 21:21:12 -0700
commit1ef3069a7ef7692bb27d64b85dd2cfdf201e33b2 (patch)
tree52d01244e956e5e2778f1cff9604fcaea9917d96 /service/README.md
parentf99b62c48d6cb9d1b79a67cb3cf5ae5e352a176b (diff)
downloadinfinitytier-1ef3069a7ef7692bb27d64b85dd2cfdf201e33b2.tar.gz
infinitytier-1ef3069a7ef7692bb27d64b85dd2cfdf201e33b2.zip
1.2.0 release notes and a few final tweaks and cleanup.
Diffstat (limited to 'service/README.md')
-rw-r--r--service/README.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/service/README.md b/service/README.md
index bdf713c1..f5223f2d 100644
--- a/service/README.md
+++ b/service/README.md
@@ -27,6 +27,7 @@ Settings available in `local.conf` (this is not valid JSON, and JSON does not al
"primaryPort": 0-65535, /* If set, override default port of 9993 and any command line port */
"portMappingEnabled": true|false, /* If true (the default), try to use uPnP or NAT-PMP to map ports */
"softwareUpdate": "apply"|"download"|"disable", /* Automatically apply updates, just download, or disable built-in software updates */
+ "softwareUpdateChannel": "release"|"beta", /* Software update channel */
"softwareUpdateDist": true|false, /* If true, distribute software updates (only really useful to ZeroTier, Inc. itself, default is false) */
"interfacePrefixBlacklist": [ "XXX",... ], /* Array of interface name prefixes (e.g. eth for eth#) to blacklist for ZT traffic */
"allowManagementFrom": "NETWORK/bits"|null /* If non-NULL, allow JSON/HTTP management from this IP network. Default is 127.0.0.1 only. */
@@ -57,7 +58,8 @@ An example `local.conf`:
}
},
"settings": {
- "relayPolicy": "ALWAYS"
+ "softwareUpdate": "apply",
+ "softwraeUpdateChannel": "release"
}
}
```