add protocols to edges

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

@@ -14,7 +14,7 @@ digraph email {
         // legacy
         eugeni [color="red" label="eugeni\nmailman, schleuder"]
         // new machines
-        relay [color="green"]
+        relay [color="green" label="submission-tls"]
         mx [color="green"]
         mailbox [color="green" label="mailbox\nIMAP, webmail"]
         // external boxes
@@ -25,13 +25,17 @@ digraph email {
         // all relations
 
         // mx receives email from everywhere and forwards it
-        dotdotdot -> mx -> { mailbox, eugeni, mailhosts, masquerade }
-        dotdotdot -> mailhosts
+        dotdotdot -> mx [label="SMTP"]
+        mx -> { mailbox, eugeni, mailhosts, masquerade } [label="SMTP"]
+        dotdotdot -> mailhosts [label="SMTP"]
         // user interacts with those
-        user -> { mailhosts, submission, mailbox, eugeni }
+        user -> mailhosts [label="HTTP"]
+        user -> submission [label="SMTP"]
+        user -> mailbox [label="IMAP, HTTP"]
+        user -> eugeni [label="HTTP"]
         // those all relay mail to the outside
-        { submission, mailhosts, eugeni, relay } -> dotdotdot
+        { submission, mailhosts, eugeni, relay } -> dotdotdot [label="SMTP"]
         // except those, who still go through the relay
-        tpoboxes -> relay
-        masquerade -> dotdotdot [style=tapered color=red]
+        tpoboxes -> relay [label="SMTPS"]
+        masquerade -> dotdotdot [style=tapered color=red label="SMTP, failing"]
 }

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

@@ -23,13 +23,15 @@ digraph email {
 
         // eugeni handles basically everything except some rare
         // exceptions on mailhosts
-        dotdotdot -> { mailhosts, eugeni }
+        dotdotdot -> { mailhosts, eugeni } [label="SMTP"]
         // users interact with those
-        user -> { mailhosts, submission, eugeni }
+        user -> submission [label="SMTP"]
+        user -> eugeni [label="HTTP, SMTP"]
+        user -> mailhosts [label="HTTP"]
         // those all relay mail to the outside
-        { submission, mailhosts, eugeni, masquerade } -> dotdotdot
+        { submission, mailhosts, eugeni, masquerade } -> dotdotdot [label="SMTP"]
         // except those, who still go through the relay
-        tpoboxes -> eugeni
+        tpoboxes -> eugeni [label="SMTPS"]
         // eugeni also forwards mails to the impersonators
-        eugeni -> masquerade
+        eugeni -> masquerade [label="SMTP"]
 }