github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-14 18:48:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

1.2.0 release notes and a few final tweaks and cleanup.

Browse source
This commit is contained in:
Adam Ierymenko 2017-03-14 21:21:12 -07:00
commit 1ef3069a7e
6 changed files with 90 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
service/OneService.cpp
View file

@ -745,14 +745,6 @@ public:
for(int i=0;i<3;++i)
_portsBE[i] = Utils::hton((uint16_t)_ports[i]);
// Check for legacy controller.db and terminate if present to prevent nasty surprises for DIY controller folks
if (OSUtils::fileExists((_homePath + ZT_PATH_SEPARATOR_S "controller.db").c_str())) {
Mutex::Lock _l(_termReason_m);
_termReason = ONE_UNRECOVERABLE_ERROR;
_fatalErrorMessage = "controller.db is present in our home path! run migrate-sqlite to migrate to new controller.d format.";
return _termReason;
}
_controller = new EmbeddedNetworkController(_node,(_homePath + ZT_PATH_SEPARATOR_S ZT_CONTROLLER_DB_PATH).c_str());
_node->setNetconfMaster((void *)_controller);

4
service/README.md
View file

@ -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"
}
}
```