kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 30 Pull Requests 3 Projects 2 Activity

Merge pull request 'Fix zerotier network creation' (#262) from bugfix/zerotier_default_rules into master

Browse Source 
Reviewed-on: #262
This commit is contained in:
Râu Cao 2020-12-13 12:38:59 +00:00
commit 84fdcc4760
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
site-cookbooks/kosmos_zerotier/files/zerotier-ctl.sh
View File

@ -83,7 +83,7 @@ if [ "$1" != '' ]; then
if [ "$READ_MASK" != '' ]; then if [ "$READ_MASK" != '' ]; then
ZT_NETWORK_IP_LOCAL_ROUTE_MASK=$READ_MASK ZT_NETWORK_IP_LOCAL_ROUTE_MASK=$READ_MASK
else else
echo -e "${RED}==> Please enter a vaild submask${NC}"; echo -e "${RED}==> Please enter a valid submask${NC}";
exit 1; exit 1;
fi fi
else else
@ -100,7 +100,7 @@ if [ "$1" != '' ]; then
fi fi
# Huge JSON file ahead # Huge JSON file ahead
# Do not change this JSON string! # Do not change this JSON string!
ZT_NETWORK_CONFIG="{\"auth\":\"${ZT_AUTHTOKEN}\",\"name\":\"${ZT_NETWORK_NAME}\",\"private\":${ZT_NETWORK_PRIVATE},\"allowPassiveBridging\":${ZT_NETWORK_BRIDGING},\"v4AssignMode\":\"${ZT_NETWORK_V4_ASSIGN_MODE}\",\"v6AssignMode\":\"${ZT_NETWORK_V6_ASSIGN_MODE}\",\"routes\":[{\"target\":\"${ZT_NETWORK_IP_LOCAL_ROUTE}/${ZT_NETWORK_IP_LOCAL_ROUTE_MASK}\",\"via\":null,\"flags\":0,\"metric\":0}],\"ipAssignmentPools\":[{\"ipRangeStart\":\"${ZT_NETWORK_IP_START}\",\"ipRangeEnd\":\"${ZT_NETWORK_IP_END}\"}],\"rules\":[{\"ruleNo\":10,\"action\":\"accept\"}]}" ZT_NETWORK_CONFIG="{\"auth\":\"${ZT_AUTHTOKEN}\",\"name\":\"${ZT_NETWORK_NAME}\",\"private\":${ZT_NETWORK_PRIVATE},\"allowPassiveBridging\":${ZT_NETWORK_BRIDGING},\"v4AssignMode\":\"${ZT_NETWORK_V4_ASSIGN_MODE}\",\"v6AssignMode\":\"${ZT_NETWORK_V6_ASSIGN_MODE}\",\"routes\":[{\"target\":\"${ZT_NETWORK_IP_LOCAL_ROUTE}/${ZT_NETWORK_IP_LOCAL_ROUTE_MASK}\",\"via\":null,\"flags\":0,\"metric\":0}],\"ipAssignmentPools\":[{\"ipRangeStart\":\"${ZT_NETWORK_IP_START}\",\"ipRangeEnd\":\"${ZT_NETWORK_IP_END}\"}]}"
echo '> Do you wish to add this network?' echo '> Do you wish to add this network?'
select ZT_ADD_NET_YN in 'Yes' 'No'; do select ZT_ADD_NET_YN in 'Yes' 'No'; do
case $ZT_ADD_NET_YN in case $ZT_ADD_NET_YN in