Browse Source

Fix to create-test-root-topology.

Adam Ierymenko 10 years ago
parent
commit
5185103692
2 changed files with 5 additions and 10 deletions
  1. 4 9
      .gitignore
  2. 1 1
      root-topology/test/create-test-root-topology.sh

+ 4 - 9
.gitignore

@@ -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

+ 1 - 1
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