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

Compare commits

base: kosmos:ebfd36bab8b2f9f6743b5bf7e4e26dd7f7f785aa
Branches Tags
kosmos:master
kosmos:bugfix/substr_url_matching
kosmos:notes/ejabberd_ldap_photo
kosmos:feature/akaunting
kosmos:chore/ejabberd_service_avatar
kosmos:feature/237-gitea_gpg
kosmos:jammy_jellyfish
...
compare: kosmos:84fdcc47600b9c5ae6817d09b4c841306ad0d172
Branches Tags
kosmos:master
kosmos:bugfix/substr_url_matching
kosmos:notes/ejabberd_ldap_photo
kosmos:feature/akaunting
kosmos:chore/ejabberd_service_avatar
kosmos:feature/237-gitea_gpg
kosmos:jammy_jellyfish

3 Commits
ebfd36bab8 ... 84fdcc4760

Author SHA1 Message Date
raucao
84fdcc4760 Merge pull request 'Fix zerotier network creation' (#262) from bugfix/zerotier_default_rules into master 
Reviewed-on: #262
 2020-12-13 12:38:59 +00:00
Sebastian Kippe
c4dbed8d65
Fix zerotier network creation 
Using outdated/invalid rules syntax. Remove the property entirely, so
the API will create the default rule (which is the same) on creation.

Co-authored-by: Greg Karékinian <greg@karekinian.com>
 2020-12-11 17:42:25 +01:00
Sebastian Kippe
2de9d5fe17
Fix typo 2020-12-11 17:40:40 +01:00
1 changed files with 2 additions and 2 deletions
Show Stats 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
ZT_NETWORK_IP_LOCAL_ROUTE_MASK=$READ_MASK
else
echo -e "${RED}==> Please enter a vaild submask${NC}";
echo -e "${RED}==> Please enter a valid submask${NC}";
exit 1;
fi
else
@ -100,7 +100,7 @@ if [ "$1" != '' ]; then
fi
# Huge JSON file ahead
# 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?'
select ZT_ADD_NET_YN in 'Yes' 'No'; do
case $ZT_ADD_NET_YN in