Updated configuration for Xlink-enabled fabric. (openziti/fabric#54)

openziti · Mar 23, 2020 · 84d4d7e · 84d4d7e
1 parent 887194a
commit 84d4d7e
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 9 deletions.
diff --git a/etc/001.yml b/etc/001.yml
@@ -1,4 +1,4 @@
-v: 2
+v: 3
 
 identity:
   cert:                 etc/ca/intermediate/certs/001-client.cert.pem
@@ -27,6 +27,12 @@ forwarder:
 ctrl:
   endpoint:             tls:127.0.0.1:6262
 
+link:
+  dialers:
+    - binding:          transport
+      options:
+        outQueueLen:    32
+
 listeners:
   # basic ssh proxy
   - binding:            proxy

diff --git a/etc/002.yml b/etc/002.yml
@@ -1,4 +1,4 @@
-v: 2
+v: 3
 
 identity:
   cert:                 etc/ca/intermediate/certs/002-client.cert.pem
@@ -13,4 +13,13 @@ ctrl:
   endpoint:             tls:127.0.0.1:6262
 
 link:
-  listener:             transwarp:127.0.0.1:6996
+  listeners:
+    - binding:          transport
+      listener:         tls:127.0.0.1:6002
+      advertise:        tls:127.0.0.1:6002
+      options:
+        outQueueSize:   16
+  dialers:
+    - binding:          transport
+      options:
+        outQueueSize:   32
diff --git a/etc/003.yml b/etc/003.yml
@@ -1,4 +1,4 @@
-v: 2
+v: 3
 
 identity:
   cert:                 etc/ca/intermediate/certs/003-client.cert.pem
@@ -26,6 +26,10 @@ forwarder:
 ctrl:
   endpoint:             tls:127.0.0.1:6262
 
+link:
+  dialers:
+    - binding:          transport
+
 dialers:
   - binding:            transport
     options:

diff --git a/etc/004.yml b/etc/004.yml
@@ -1,4 +1,4 @@
-v: 2
+v: 3
 
 identity:
   cert:                 etc/ca/intermediate/certs/004-client.cert.pem
@@ -22,4 +22,8 @@ ctrl:
   endpoint:             tls:127.0.0.1:6262
 
 link:
-  listener:             quic:127.0.0.1:6004
+  listeners:
+    - binding:          transport
+      listener:         tls:127.0.0.1:6004
+  dialers:
+    - binding:          transport
diff --git a/go.mod b/go.mod
@@ -24,9 +24,9 @@ require (
 	github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19
 	github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc
 	github.com/netfoundry/ziti-edge v0.12.0
-	github.com/netfoundry/ziti-fabric v0.11.1
-	github.com/netfoundry/ziti-foundation v0.7.0
-	github.com/netfoundry/ziti-sdk-golang v0.11.1
+	github.com/netfoundry/ziti-fabric v0.11.2
+	github.com/netfoundry/ziti-foundation v0.7.1
+	github.com/netfoundry/ziti-sdk-golang v0.11.2
 	github.com/pborman/uuid v1.2.0
 	github.com/pkg/errors v0.8.1
 	github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563

diff --git a/go.sum b/go.sum
@@ -230,6 +230,8 @@ github.com/netfoundry/ziti-foundation v0.7.0 h1:Lrcq88sosUg0w0lwO4iU0ksiFB1q6H4Z
 github.com/netfoundry/ziti-foundation v0.7.0/go.mod h1:MK2ajCpS40MtiZFnMYjKIBDTQFDWwgqNq+RxypNjl9U=
 github.com/netfoundry/ziti-sdk-golang v0.11.1 h1:TqCEGo4d3yBQ8a5MLJBrgWvlRd0BtaB2wJk7uXMlW8w=
 github.com/netfoundry/ziti-sdk-golang v0.11.1/go.mod h1:BSP+tnw+s1qp7DcjoifofQtpkkgt7mwDoPSIe9D7w8s=
+github.com/netfoundry/ziti-sdk-golang v0.11.2 h1:wgi77QSP9b5FX25hgDTH29lPOCeIW6FI/NiGDyOAg8Y=
+github.com/netfoundry/ziti-sdk-golang v0.11.2/go.mod h1:gQ7vBGx3D017VcvCYk4gFLL5oxbUcLH9uIxw/Vl2B6w=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/oleiade/reflections v1.0.0 h1:0ir4pc6v8/PJ0yw5AEtMddfXpWBXg9cnG7SgSoJuCgY=
 github.com/oleiade/reflections v1.0.0/go.mod h1:RbATFBbKYkVdqmSFtx13Bb/tVhR0lgOBXunWTZKeL4w=