WIP

config/concepts.yaml

@@ -15,7 +15,6 @@ concepts:
 
       <img src="images/network-1.svg"/>
       <img src="images/network-2.svg"/>
-      <img src="images/network-3.svg"/>
   - name: site
     links:
       - title: Network concept
@@ -61,7 +60,6 @@ concepts:
 
       <img src="images/namespace-1.svg"/>
       <img src="images/namespace-2.svg"/>
-      <img src="images/namespace-3.svg"/>
     overview: |
       - XXX what do they look like on each platform?
       - Each site corresponds to one namespace
@@ -104,6 +102,8 @@ concepts:
       obtain a certificate signed by the grant's certificate authority
       (CA), within a certain expiration window and for a limited
       number of redemptions.
+    overview: |
+      - Tokens have limited lifetimes and limited uses
   - name: access token
     links:
       - title: Access grant concept
@@ -134,23 +134,36 @@ concepts:
 
       <img src="images/service-1.svg"/>
       <img src="images/service-2.svg"/>
+      <img src="images/service-3.svg"/>
     overview: |
       - XXX at the network level
       - XXX a listener and a connector bound together by a routing key
   - name: listener
     links:
+      - title: Service concept
+        url: /concepts/service.html
       - title: Connector concept
         url: /concepts/connector.html
+      - title: Routing key concept
+        url: /concepts/routing-key.html
     description: |
       A _listener_ binds a local connection endpoint to connectors in
       remote sites.
+
+      <img src="images/listener-1.svg"/>
   - name: connector
     links:
+      - title: Service concept
+        url: /concepts/service.html
       - title: Listener concept
         url: /concepts/listener.html
+      - title: Routing key concept
+        url: /concepts/routing-key.html
     description: |
       A _connector_ binds a local workload to listeners in remote
       sites.
+
+      <img src="images/connector-1.svg"/>
     overview: |
       - A connector targets a workload in the local site (or
         reachable on the local network).

input/concepts/connector.md

@@ -5,8 +5,12 @@ refdog_object_links:
   url: /resources/connector.html
 - title: Connector command
   url: /commands/connector/index.html
+- title: Service concept
+  url: /concepts/service.html
 - title: Listener concept
   url: /concepts/listener.html
+- title: Routing key concept
+  url: /concepts/routing-key.html
 ---
 
 # Connector concept
@@ -16,4 +20,6 @@ refdog_object_links:
 A _connector_ binds a local workload to listeners in remote
 sites.
 
+<img src="images/connector-1.svg"/>
+
 </section>

input/concepts/images/access-token-1.d2

@@ -1,3 +1,5 @@
-direction: right
+...@common
 
-Access grant -> Access token: Issues
+Site 1.Access grant -- Site 2.Access token
+
+Site*.class: neutral

input/concepts/images/access-token-2.d2

@@ -1,7 +1,11 @@
+...@common
+
 shape: sequence_diagram
 
 Site 1 -> Site 2: Issue token
 Site 2 -> Site 1: Redeem token
 
 Site 1 -> Site 2: Transfer link details
 Site 2 -> Site 1: Create link
+
+Site*.class: neutral

input/concepts/images/common.d2

@@ -0,0 +1,20 @@
+classes: {
+  notion: {
+    style: {
+      stroke-width: 1
+      fill: "#eee"
+      bold: false
+      italic: true
+    }
+  }
+
+  neutral: {
+    style: {
+      stroke-width: 1
+      fill: "#eee"
+      font-size: 16
+    }
+  }
+}
+
+direction: right

input/concepts/images/connector-1.d2

@@ -0,0 +1,15 @@
+...@common
+
+Site: {
+  Connector -> Server 1
+  Connector -> Server 2
+  Connector -> Server 3
+
+  Server*.style.fill: white
+}
+
+Listeners -- Routing key -- Site.Connector
+
+Listeners.class: notion
+Routing key.class: notion
+Site*.class: neutral

input/concepts/images/link-1.d2

@@ -1,3 +1,5 @@
-direction: right
+...@common
 
 Site 1."Link " -> Site 2.Link access
+
+Site*.class: neutral

input/concepts/images/link-2.d2

@@ -1,4 +1,6 @@
-direction: right
+...@common
 
 Site 1."Link 1" -> Site 2.Link access
 Site 1."Link 2" -> Site 3.Link access
+
+Site*.class: neutral

input/concepts/images/link-3.d2

@@ -1,4 +1,6 @@
-direction: right
+...@common
 
 Site 1."Link " -> Site C.Link access <- Site 2."Link "
 Site 3."Link " -> Site C.Link access <- Site 4."Link "
+
+Site*.class: neutral

input/concepts/images/listener-1.d2

@@ -0,0 +1,17 @@
+...@common
+
+direction: right
+
+Site: {
+  Client 1 -> Listener
+  Client 2 -> Listener
+  Client 3 -> Listener
+
+  Client*.style.fill: white
+}
+
+Site.Listener -- Routing key -- Connectors
+
+Connectors.class: notion
+Routing key.class: notion
+Site*.class: neutral

input/concepts/images/namespace-1.d2

@@ -1,7 +1,7 @@
-direction: right
+...@common
 
 Namespace: {
-  Workload 1.style.fill: white
-  Workload 2.style.fill: white
-  Workload 3.style.fill: white
+  Workload 1
+  Workload 2
+  Workload 3
 }

input/concepts/images/namespace-2.d2

@@ -1,7 +1,9 @@
-direction: right
+...@common
 
 Platform: {
   Namespace 1
   Namespace 2
   Namespace 3
 }
+
+Platform.class: neutral