ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-23 10:43:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to create-test-root-topology.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-04-30 16:13:17 -07:00
parent 3ac23165c7
commit 5185103692
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.gitignore vendored
View File

@ -34,13 +34,8 @@
.qmake.stash .qmake.stash
*.autosave *.autosave
/ZeroTier One.dmg /ZeroTier One.dmg
/root-topology/bin2c
/root-topology/mktopology
/root-topology/*.secret /root-topology/*.secret
/testnet/local-testnet/n???? /root-topology/test/supernodes
/testnet/local-testnet/*/peers.persist /root-topology/test/test-root-topology
/testnet/local-testnet/*/authtoken.secret
/testnet/local-testnet/*/*.log
/testnet/local-testnet/*/*.old
/testnet/local-testnet/*/root-topology
/testnet/local-testnet/*/local.conf
/testnet/local-testnet/*/networks.d
/netconf/netconf.db

2
root-topology/test/create-test-root-topology.sh
View File

@ -11,7 +11,7 @@ rm -rf supernodes
mkdir supernodes mkdir supernodes
for cid in `docker ps -f 'name=test-supernode-*' -q`; do for cid in `docker ps -f 'name=test-supernode-*' -q`; do
id=`docker exec $cid cat /var/lib/zerotier-one/identity.public` id=`docker exec $cid cat /var/lib/zerotier-one/identity.secret | cut -d : -f 1-3`
ztaddr=`echo $id | cut -d : -f 1` ztaddr=`echo $id | cut -d : -f 1`
ip=`docker exec $cid ifconfig | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p'` ip=`docker exec $cid ifconfig | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p'`
echo $cid $ztaddr $id $ip echo $cid $ztaddr $id $ip