ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-30 08:04:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix central docker launch without redis

Browse Source
This commit is contained in:
Grant Limberg 2021-09-15 09:21:41 -07:00
parent 9c6ec2c52e
commit 27ce787fbd
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/central-controller-docker/main.sh
View File

@ -50,7 +50,7 @@ if [ "$ZT_USE_REDIS" == "true" ]; then
} }
" "
else else
REDIS="\"redis\": {}" REDIS="\"redis\": null"
fi fi
mkdir -p /var/lib/zerotier-one mkdir -p /var/lib/zerotier-one

2
service/OneService.cpp
View File

@ -1071,7 +1071,7 @@ public:
if (redis.is_object() && _rc == NULL) { if (redis.is_object() && _rc == NULL) {
_rc = new RedisConfig; _rc = new RedisConfig;
_rc->hostname = OSUtils::jsonString(redis["hostname"],""); _rc->hostname = OSUtils::jsonString(redis["hostname"],"");
_rc->port = redis["port"]; _rc->port = OSUtils::jsonInt(redis["port"],0);
_rc->password = OSUtils::jsonString(redis["password"],""); _rc->password = OSUtils::jsonString(redis["password"],"");
_rc->clusterMode = OSUtils::jsonBool(redis["clusterMode"], false); _rc->clusterMode = OSUtils::jsonBool(redis["clusterMode"], false);
} }