From 54c560bb4fd140ac099f4ab44825ed10b3815b7c Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Mon, 2 Dec 2024 16:00:00 +0100
Subject: [PATCH] add network map

---
 Makefile |  5 ++---
 map.ge   | 38 ++++++++++++++++++++++++++++++++++++++
 map.md   |  7 -------
 3 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 map.ge
 delete mode 100644 map.md

diff --git a/Makefile b/Makefile
index 08af478..bf1cfb8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,2 @@
-output: map.txt
-map.txt: map.md
-	cat map.md | graph-easy --boxart > map.txt
+map.txt: map.ge
+	graph-easy --boxart < $< > $@
diff --git a/map.ge b/map.ge
new file mode 100644
index 0000000..1f17a8b
--- /dev/null
+++ b/map.ge
@@ -0,0 +1,38 @@
+# Network map of Decentrala.  Use with:
+# graph-easy --boxart < netmap.txt
+
+(Mox
+	[ m_router ]{label: router ;}
+	[ wireguard ] --> [ m_nginx ]{label: nginx-11 ;}
+	[ wiki ] --> [ m_nginx ]
+	[ gitea ] --> [ m_nginx ]
+	[ tor11 ] --> [ m_nginx ] --> [ m_router ]
+	[ smtp ]
+)
+
+(Serverko
+	[ s_nginx ]{label: nginx-12 ;}
+	[ s_router ]{label: router ;}
+	[ s_nginx ] --> [ nextcloud ]
+	[ s_nginx ] --> [ tor12 ]
+	[ s_nginx ] --> [ s_router ]
+)
+
+(splint.rs
+	[ soft-serve ]
+	[ mail-cache ]
+)
+
+[ tor12 ] <..> [ onions ] <..> [ tor11 ]
+[ m_router ] <..> [ BGP ] <..> [ madness ] <..> [ s_router ]
+[ smtp ] <..> [ madness ] <..> [  mail-cache ]
+[ A ]{label: "" ;}
+[ B ]{label: "" ;}
+[ C ]{label: "" ;}
+[ D ]{label: "" ;}
+[ onions ] <..> [ A ]
+[ onions ] <..> [ B ]
+[ A ] <..> [ C ]
+[ B ] <..> [ D ]
+
+(Sharks! [ D ])
diff --git a/map.md b/map.md
deleted file mode 100644
index 2e8c907..0000000
--- a/map.md
+++ /dev/null
@@ -1,7 +0,0 @@
-### Network Map Generator ###
-# Used with graph-easy.
-# Install graph easy with `apt install perl-graph-easy`.
-
-[ gateway ] -- ssh-2222 --> [ gitea11 (192.168.1.36) ]
-[ gateway ] --> [ ssh11 (192.168.1.20) ]
-