diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-14 21:21:12 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-14 21:21:12 -0700 |
| commit | 1ef3069a7ef7692bb27d64b85dd2cfdf201e33b2 (patch) | |
| tree | 52d01244e956e5e2778f1cff9604fcaea9917d96 /service | |
| parent | f99b62c48d6cb9d1b79a67cb3cf5ae5e352a176b (diff) | |
| download | infinitytier-1ef3069a7ef7692bb27d64b85dd2cfdf201e33b2.tar.gz infinitytier-1ef3069a7ef7692bb27d64b85dd2cfdf201e33b2.zip | |
1.2.0 release notes and a few final tweaks and cleanup.
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 8 | ||||
| -rw-r--r-- | service/README.md | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 129c0499..4a2102f1 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -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); 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" } } ``` |