diff --git a/README.md b/README.md
index 49197bb..d23253f 100644
--- a/README.md
+++ b/README.md
@@ -26,10 +26,6 @@ make install
make diagram
```
-## todo
-
-- ditch `diagrams` for plain pygraphviz to hopefully annotate edges with SVG tooltips?
-
## diagram
![landscape](./bij1_it_landscape.png)
diff --git a/bij1_it_landscape.png b/bij1_it_landscape.png
index 97c1c72..cde6d32 100644
Binary files a/bij1_it_landscape.png and b/bij1_it_landscape.png differ
diff --git a/diagram.py b/diagram.py
index 4134307..4dda948 100644
--- a/diagram.py
+++ b/diagram.py
@@ -9,14 +9,16 @@ from diagrams.elastic.elasticsearch import Beats, Elasticsearch, Kibana, Logstas
wordpress = "./resources/wordpress.png"
wings = "./resources/wings.png"
-trello = "./resources/trello.jpg"
+trello = "./resources/trello.png"
gitlab_logo = "./resources/gitlab.png"
-github_logo = "./resources/github.png"
+github_logo = "./resources/github.svg"
mailchimp = "./resources/mailchimp.png"
nginx = "./resources/nginx.png"
www = "./resources/www.png"
-instagram = "./resources/instagram.jpg"
-tiktok_logo = "./resources/tiktok.jpg"
+instagram = "./resources/instagram.png"
+tiktok_logo = "./resources/tiktok.svg"
+youtube_logo = "./resources/youtube.png"
+linkedin_logo = "./resources/linkedin.svg"
heroku = "./resources/heroku.png"
transip_logo = "./resources/transip.png"
greenhost_logo = "./resources/greenhost.png"
@@ -30,11 +32,16 @@ with Diagram("BIJ1 IT landscape"):
fb = Facebook("facebook.com/www.bij1.org")
tw = Twitter("twitter.com/PolitiekBIJ1")
insta = Custom("instagram.com/politiek_bij1", instagram)
+ yt = Custom("youtube.com/c/BIJ1Politiek", youtube_logo)
+ vimeo = Custom("vimeo.com/bij1", "./resources/vimeo.svg")
+ linkedin = Custom("linkedin.com/company/bij1", linkedin_logo)
with Cluster("BIJ1 local socials"):
local_fb = Facebook("Local FBs")
local_tw = Twitter("Local Twitters")
local_insta = Custom("Local Instagrams", instagram)
+ local_yt = Custom("Local Youtubes", youtube_logo)
+ local_li = Custom("Local LinkedIns", linkedin_logo)
with Cluster("Radicaal socials"):
fb_radicaal = Facebook("facebook.com/pjo.radicaal")
@@ -48,7 +55,7 @@ with Diagram("BIJ1 IT landscape"):
transip_intl = Custom("TransIP Clemencia Redmond", transip_logo)
greenhost = Custom("GreenHost BIJ1", greenhost_logo)
greenhost_pjo = Custom("GreenHost Radicaal", greenhost_logo)
- hetzner = Custom("Hetzner", "./resources/hetzner.jpg")
+ hetzner = Custom("Hetzner", "./resources/hetzner.png")
wpengine = Custom("WpEngine", "./resources/wpengine.jpg")
email = Custom("transip.email (BIJ1)", email_logo)
email_intl = Custom("transip.email (Audre Lorde)", email_logo)
@@ -118,14 +125,14 @@ with Diagram("BIJ1 IT landscape"):
greenhost >> kibana
with Cluster("Meetings"):
- zoom = Custom("Zoom", "./resources/zoom.jpg")
- jitsi = Custom("meet.bij1.org", "./resources/jitsi.jpg")
- bbb = Custom("bigbluebutton.bij1.org", "./resources/bbb.png")
+ zoom = Custom("Zoom", "./resources/zoom.svg")
+ jitsi = Custom("meet.bij1.org", "./resources/jitsi.svg")
+ bbb = Custom("bigbluebutton.bij1.org", "./resources/bigbluebutton.svg")
bbb >> hetzner
ingang = Rails("vergadering.bij1.org/ingang/")
flowmailer = Custom("FlowMailer", "./resources/flowmailer.svg")
- helios = Custom("stemmen.bij1.org", "./resources/helios.jpg")
- coturn = Custom("turn.bij1.org", "./resources/webrtc.jpg")
+ helios = Custom("stemmen.bij1.org", "./resources/helios.png")
+ coturn = Custom("turn.bij1.org", "./resources/webrtc.png")
coturn >> bbb >> ingang >> helios
ingang >> flowmailer
@@ -141,14 +148,16 @@ with Diagram("BIJ1 IT landscape"):
doemee_wp = Custom("doemee.bij1.org", wordpress)
doemee_wp >> wpengine
doemee_wp >> trello_vrijwilligers
- radicaal = Custom("radicaal.bij1.org", "./resources/squarespace.jpg")
- shop = Custom("shop.bij1.org", "./resources/woocommerce.jpg")
+ radicaal = Custom("radicaal.bij1.org", "./resources/squarespace.png")
+ shop = Custom("shop.bij1.org", "./resources/woocommerce.svg")
+ wings_bij1 = Custom("Wings", wings)
proxy >> bij1_wp
proxy >> greenhost
bij1_wp >> greenhost
staging_wp >> greenhost
shop >> bij1_wp
+ bij1_wp >> wings_bij1 # donations
with Cluster("Static"):
static = Custom("static.bij1.net", nginx)
@@ -184,7 +193,7 @@ with Diagram("BIJ1 IT landscape"):
# kom = Custom("kom.bij1.org", www)
# kom >> transip
- # keycloak = Custom("jij.bij1.org", "./resources/keycloak.jpg")
+ # keycloak = Custom("jij.bij1.org", "./resources/keycloak.svg")
cloud = Nextcloud("cloud.bij1.org")
cloud >> greenhost
# kom >> keycloak
@@ -193,10 +202,10 @@ with Diagram("BIJ1 IT landscape"):
# what shouldn't be our cloud but currently is 😩
gdrive = Custom("Google Drive", "./resources/google-drive.png")
- mega = Custom("Mega", "./resources/mega.jpg")
+ mega = Custom("Mega", "./resources/mega.svg")
with Cluster("CRM"):
- civi = Custom("CiviCRM", "./resources/civicrm.jpg")
+ civi = Custom("CiviCRM", "./resources/civicrm.svg")
bij1algemeen = Php("bij1algemeen")
bij1rules = Php("bij1rules")
bij1migratie = Php("bij1migratie")
@@ -216,3 +225,18 @@ with Diagram("BIJ1 IT landscape"):
mollie = Custom("Mollie", "./resources/mollie.jpg")
export_mollie = Nodejs("export-mollie")
mollie >> export_mollie >> bij1migratie
+
+ terraform = Custom("Terraform", "./resources/terraform.png")
+ terraform >> gitlab
+
+ canva = Custom("Canva", "./resources/canva.png")
+
+ snelstart = Custom("snelstart", "./resources/snelstart.svg")
+
+ with Cluster("link collections"):
+ linktree = Custom("Linktree", "./resources/linktree.png")
+ linktree >> local_insta
+ linkbee = Custom("links.bij1.org", "./resources/link.png")
+ wings_bij1 >> linkbee
+ linkbee >> insta
+
diff --git a/resources/airtable.png b/resources/airtable.png
index 8bfdec2..86fd529 100644
Binary files a/resources/airtable.png and b/resources/airtable.png differ
diff --git a/resources/bbb.png b/resources/bbb.png
deleted file mode 100644
index d8ea9a9..0000000
Binary files a/resources/bbb.png and /dev/null differ
diff --git a/resources/bigbluebutton.svg b/resources/bigbluebutton.svg
new file mode 100644
index 0000000..f5b3095
--- /dev/null
+++ b/resources/bigbluebutton.svg
@@ -0,0 +1,125 @@
+
+
\ No newline at end of file
diff --git a/resources/canva.png b/resources/canva.png
new file mode 100644
index 0000000..436deb3
Binary files /dev/null and b/resources/canva.png differ
diff --git a/resources/civicrm.jpg b/resources/civicrm.jpg
deleted file mode 100644
index 4cb948f..0000000
Binary files a/resources/civicrm.jpg and /dev/null differ
diff --git a/resources/civicrm.svg b/resources/civicrm.svg
new file mode 100644
index 0000000..bebbae3
--- /dev/null
+++ b/resources/civicrm.svg
@@ -0,0 +1,112 @@
+
+
\ No newline at end of file
diff --git a/resources/email.png b/resources/email.png
index a3e4ca3..02cd76c 100644
Binary files a/resources/email.png and b/resources/email.png differ
diff --git a/resources/github.png b/resources/github.png
deleted file mode 100644
index d5dacf8..0000000
Binary files a/resources/github.png and /dev/null differ
diff --git a/resources/github.svg b/resources/github.svg
new file mode 100644
index 0000000..93b0e01
--- /dev/null
+++ b/resources/github.svg
@@ -0,0 +1,90 @@
+
+
+
\ No newline at end of file
diff --git a/resources/gitlab.svg b/resources/gitlab.svg
new file mode 100644
index 0000000..1d89e40
--- /dev/null
+++ b/resources/gitlab.svg
@@ -0,0 +1,70 @@
+
\ No newline at end of file
diff --git a/resources/google-drive.svg b/resources/google-drive.svg
new file mode 100644
index 0000000..a7935ce
--- /dev/null
+++ b/resources/google-drive.svg
@@ -0,0 +1,77 @@
+
\ No newline at end of file
diff --git a/resources/helios.jpg b/resources/helios.jpg
deleted file mode 100644
index 16417a4..0000000
Binary files a/resources/helios.jpg and /dev/null differ
diff --git a/resources/helios.png b/resources/helios.png
new file mode 100644
index 0000000..e011d99
Binary files /dev/null and b/resources/helios.png differ
diff --git a/resources/heroku.png b/resources/heroku.png
index 613cbfd..5b521a9 100644
Binary files a/resources/heroku.png and b/resources/heroku.png differ
diff --git a/resources/hetzner.jpg b/resources/hetzner.jpg
deleted file mode 100644
index 9bb97c9..0000000
Binary files a/resources/hetzner.jpg and /dev/null differ
diff --git a/resources/hetzner.png b/resources/hetzner.png
new file mode 100644
index 0000000..8c5fbcb
Binary files /dev/null and b/resources/hetzner.png differ
diff --git a/resources/instagram.jpg b/resources/instagram.jpg
deleted file mode 100644
index 2cfeca5..0000000
Binary files a/resources/instagram.jpg and /dev/null differ
diff --git a/resources/instagram.png b/resources/instagram.png
new file mode 100644
index 0000000..dcb0a8c
Binary files /dev/null and b/resources/instagram.png differ
diff --git a/resources/jitsi.jpg b/resources/jitsi.jpg
deleted file mode 100644
index 51599bf..0000000
Binary files a/resources/jitsi.jpg and /dev/null differ
diff --git a/resources/jitsi.svg b/resources/jitsi.svg
new file mode 100644
index 0000000..4c9289a
--- /dev/null
+++ b/resources/jitsi.svg
@@ -0,0 +1,77 @@
+
+
+
\ No newline at end of file
diff --git a/resources/keycloak.jpg b/resources/keycloak.jpg
deleted file mode 100644
index 587324d..0000000
Binary files a/resources/keycloak.jpg and /dev/null differ
diff --git a/resources/keycloak.svg b/resources/keycloak.svg
new file mode 100644
index 0000000..7c881e1
--- /dev/null
+++ b/resources/keycloak.svg
@@ -0,0 +1,135 @@
+
+
\ No newline at end of file
diff --git a/resources/link.png b/resources/link.png
new file mode 100644
index 0000000..664676b
Binary files /dev/null and b/resources/link.png differ
diff --git a/resources/linkedin.svg b/resources/linkedin.svg
new file mode 100644
index 0000000..f19c6e2
--- /dev/null
+++ b/resources/linkedin.svg
@@ -0,0 +1,97 @@
+
+
+
\ No newline at end of file
diff --git a/resources/linktree.png b/resources/linktree.png
new file mode 100644
index 0000000..256b7ba
Binary files /dev/null and b/resources/linktree.png differ
diff --git a/resources/mailchimp.png b/resources/mailchimp.png
index c729290..f2bd98f 100644
Binary files a/resources/mailchimp.png and b/resources/mailchimp.png differ
diff --git a/resources/mega.jpg b/resources/mega.jpg
deleted file mode 100644
index 9317478..0000000
Binary files a/resources/mega.jpg and /dev/null differ
diff --git a/resources/mega.svg b/resources/mega.svg
new file mode 100644
index 0000000..e44670d
--- /dev/null
+++ b/resources/mega.svg
@@ -0,0 +1,72 @@
+
+
+
\ No newline at end of file
diff --git a/resources/nginx.png b/resources/nginx.png
index 6f4011a..72127c2 100644
Binary files a/resources/nginx.png and b/resources/nginx.png differ
diff --git a/resources/snelstart.svg b/resources/snelstart.svg
new file mode 100644
index 0000000..7922237
--- /dev/null
+++ b/resources/snelstart.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/resources/squarespace.jpg b/resources/squarespace.jpg
deleted file mode 100644
index 82806bc..0000000
Binary files a/resources/squarespace.jpg and /dev/null differ
diff --git a/resources/squarespace.png b/resources/squarespace.png
new file mode 100644
index 0000000..1b87501
Binary files /dev/null and b/resources/squarespace.png differ
diff --git a/resources/terraform.png b/resources/terraform.png
new file mode 100644
index 0000000..036cb4f
Binary files /dev/null and b/resources/terraform.png differ
diff --git a/resources/tiktok.jpg b/resources/tiktok.jpg
deleted file mode 100644
index 146de4a..0000000
Binary files a/resources/tiktok.jpg and /dev/null differ
diff --git a/resources/tiktok.svg b/resources/tiktok.svg
new file mode 100644
index 0000000..78a3f2f
--- /dev/null
+++ b/resources/tiktok.svg
@@ -0,0 +1,83 @@
+
+
+
+
\ No newline at end of file
diff --git a/resources/trello.jpg b/resources/trello.jpg
deleted file mode 100644
index 5d5a029..0000000
Binary files a/resources/trello.jpg and /dev/null differ
diff --git a/resources/trello.png b/resources/trello.png
new file mode 100644
index 0000000..1bca7e0
Binary files /dev/null and b/resources/trello.png differ
diff --git a/resources/vimeo.svg b/resources/vimeo.svg
new file mode 100644
index 0000000..9570336
--- /dev/null
+++ b/resources/vimeo.svg
@@ -0,0 +1,77 @@
+
+
\ No newline at end of file
diff --git a/resources/webrtc.jpg b/resources/webrtc.jpg
deleted file mode 100644
index d5f4853..0000000
Binary files a/resources/webrtc.jpg and /dev/null differ
diff --git a/resources/webrtc.png b/resources/webrtc.png
new file mode 100644
index 0000000..7db1b01
Binary files /dev/null and b/resources/webrtc.png differ
diff --git a/resources/wings.png b/resources/wings.png
index d7975a4..3602e3c 100644
Binary files a/resources/wings.png and b/resources/wings.png differ
diff --git a/resources/woocommerce.jpg b/resources/woocommerce.jpg
deleted file mode 100644
index 2014419..0000000
Binary files a/resources/woocommerce.jpg and /dev/null differ
diff --git a/resources/woocommerce.svg b/resources/woocommerce.svg
new file mode 100644
index 0000000..8b3656f
--- /dev/null
+++ b/resources/woocommerce.svg
@@ -0,0 +1,84 @@
+
+
\ No newline at end of file
diff --git a/resources/youtube.png b/resources/youtube.png
new file mode 100644
index 0000000..e7a4360
Binary files /dev/null and b/resources/youtube.png differ
diff --git a/resources/zoom.jpg b/resources/zoom.jpg
deleted file mode 100644
index a97c89a..0000000
Binary files a/resources/zoom.jpg and /dev/null differ
diff --git a/resources/zoom.svg b/resources/zoom.svg
new file mode 100644
index 0000000..b5fb4be
--- /dev/null
+++ b/resources/zoom.svg
@@ -0,0 +1,84 @@
+
+
\ No newline at end of file