diff options
author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-11-08 12:41:32 -0800 |
---|---|---|
committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-11-08 12:41:32 -0800 |
commit | 6f3595bfd23ca31510741ab66515f2fe06120007 (patch) | |
tree | 22856489f200d574b9e53ab737e722dfd15ed087 /service | |
parent | 4524899e4df849ab661a28676e5d0c44d239aa9f (diff) | |
parent | 00e1b0ed1028e0da3ec4c56cacf72e99e91452db (diff) | |
download | infinitytier-6f3595bfd23ca31510741ab66515f2fe06120007.tar.gz infinitytier-6f3595bfd23ca31510741ab66515f2fe06120007.zip |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'service')
-rw-r--r-- | service/README.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/service/README.md b/service/README.md index 8fe6a3af..1c71fbdc 100644 --- a/service/README.md +++ b/service/README.md @@ -82,6 +82,9 @@ Most network settings are not writable, as they are defined by the network contr <tr><td>assignedAddresses</td><td>[string]</td><td>ZeroTier-managed IP address assignments as array of IP/netmask bits tuples</td><td>no</td></tr> <tr><td>routes</td><td>[route]</td><td>ZeroTier-managed route assignments for a network. See below for a description of the route object.</td><td>no</td></tr> <tr><td>portDeviceName</td><td>string</td><td>OS-specific network device name (if available)</td><td>no</td></tr> +<tr><td>allowManaged</td><td>boolean</td><td>Whether ZeroTier-managed IP addresses are allowed.</td><td>yes</td></tr> +<tr><td>allowGlobal</td><td>boolean</td><td>Whether globally-reachable IP addresses are allowed to be assigned.</td><td>yes</td></tr> +<tr><td>allowDefault</td><td>boolean</td><td>Whether a default route is allowed to be assigned for the network (route all traffic via ZeroTier)</td><td>yes</td></tr> </table> `route` objects |