draft architecture diagrams

policy/tpa-rfc-15-email-services.md

@@ -192,8 +192,6 @@ described in detail below:
  h. New mail relays
  i. Puppet refactoring
 
-TODO: architecture diagram
-
 ### End-to-end deliverability checks
 
 End-to-end deliverability monitoring involves:
@@ -346,6 +344,10 @@ tpo/tpa/team#40626][] for details. This should probably happen
 
 Note: this task list must match the cost estimates below.
 
+## Architecture diagram
+
+TODO: architecture diagram
+
 ## Timeline
 
 This timeline is a draft, and will be updated according to when this

policy/tpa-rfc-15-email-services/architecture-post.dot

+digraph email {
+        label="Email architecture TPA-RFC-15 plan, torproject.org, April 2022"
+        compound=true; nodesep=1.0;
+        labelloc=bottom
+
+        subgraph clustertpa {
+                label="TPA-managed machines"
+                tpoboxes [label="other non mail hosts"]
+                submission
+                mailhosts [color="orange" label="mail hosts\ngitlab, RT, CiviCRM"]
+                mailman [color="red"]
+                schleuder [color="red"]
+                relay [color="green"]
+                mx [color="green"]
+                mailbox [color="green"]
+                mx -> { mailbox, schleuder, mailman }
+        }
+        dotdotdot [label="remote mail hosts"]
+        user [shape=triangle]
+        user -> mailhosts
+        user -> { submission, mailbox }
+        submission -> dotdotdot -> mx
+        tpoboxes -> relay -> dotdotdot
+        mailhosts -> dotdotdot
+}

policy/tpa-rfc-15-email-services/architecture-pre.dot

+digraph email {
+        label="Email architecture, torproject.org, April 2022"
+        compound=true; nodesep=1.0;
+
+        internet
+        subgraph clustertpa {
+                label="TPA-managed machines"
+                tpoboxes
+                subgraph clustermailhosts {
+                        gitlab
+                        civicrm
+                        RT
+                        label="mail hosts"
+                }
+
+                subgraph clustereugeni {
+                        label=eugeni
+                        mailman
+                        relay
+                        mx
+                        schleuder
+                }
+        }
+        RT -> internet [ltail=clustermailhosts]
+        internet -> RT [lhead=clustermailhosts]
+        internet -> mx
+        tpoboxes -> relay -> internet
+        internet -> riseup -> internet
+        internet -> gmail -> internet
+        internet -> dotdotdot -> internet
+        dotdotdot [label="..."]
+}