diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-30 16:13:17 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-30 16:13:17 -0700 |
| commit | 5185103692bdae6b4b14fe147c5354354450c1a3 (patch) | |
| tree | 7e6a2113fe69ab2c57bf1fcbc84cb1cf3b2659d4 | |
| parent | 3ac23165c78dc98c8e58180c58959624091fec00 (diff) | |
| download | infinitytier-5185103692bdae6b4b14fe147c5354354450c1a3.tar.gz infinitytier-5185103692bdae6b4b14fe147c5354354450c1a3.zip | |
Fix to create-test-root-topology.
| -rwxr-xr-x | .gitignore | 13 | ||||
| -rwxr-xr-x | root-topology/test/create-test-root-topology.sh | 2 |
2 files changed, 5 insertions, 10 deletions
@@ -34,13 +34,8 @@ .qmake.stash *.autosave /ZeroTier One.dmg +/root-topology/bin2c +/root-topology/mktopology /root-topology/*.secret -/testnet/local-testnet/n???? -/testnet/local-testnet/*/peers.persist -/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 +/root-topology/test/supernodes +/root-topology/test/test-root-topology diff --git a/root-topology/test/create-test-root-topology.sh b/root-topology/test/create-test-root-topology.sh index 032d9c2e..86c0577c 100755 --- a/root-topology/test/create-test-root-topology.sh +++ b/root-topology/test/create-test-root-topology.sh @@ -11,7 +11,7 @@ rm -rf supernodes mkdir supernodes 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` 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 |