From 195db3705254dcbe2fd1a488a6c45d028bed1cd9 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 30 Mar 2020 13:28:39 +0100
Subject: [PATCH] Rename docs and scripts

---
 WIRING.md                        | 6 +++---
 dendrite-config.yaml             | 2 +-
 docker/README.md                 | 2 +-
 docker/dendrite-docker.yml       | 2 +-
 docker/docker-compose.yml        | 8 ++++----
 docker/services/edu-server.sh    | 5 +++++
 docker/services/typing-server.sh | 5 -----
 7 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 docker/services/edu-server.sh
 delete mode 100644 docker/services/typing-server.sh

diff --git a/WIRING.md b/WIRING.md
index bddb1614c..8ec5b0432 100644
--- a/WIRING.md
+++ b/WIRING.md
@@ -72,7 +72,7 @@ Diagram:
     |            |                                                                                |          |
     |            |                                                      +---+                     |          |
     |            |                                           +----------| S |                     |          |
-    |            |                                           | Typing   +---+                     |          |
+    |            |                                           | EDU      +---+                     |          |
     |            |>=========================================>| Server     |>=====================>|          |
     +------------+                                           |            |                       +----------+
                                                    +---+     |            |
@@ -156,7 +156,7 @@ choke-point to implement ratelimiting and backoff correctly.
  * It may be impossible to implement without folding it into the Room Server
    forever coupling the components together.
 
-## Typing Server
+## EDU Server
 
  * Reads new updates to typing from the logs written by the FS and CTS.
  * Updates the current list of people typing in a room.
@@ -179,7 +179,7 @@ choke-point to implement ratelimiting and backoff correctly.
  * Reads new events and the current state of the rooms from logs written by the Room Server.
  * Reads new receipts positions from the logs written by the Receipts Server.
  * Reads changes to presence from the logs written by the Presence Server.
- * Reads changes to typing from the logs written by the Typing Server.
+ * Reads changes to typing from the logs written by the EDU Server.
  * Writes when a client starts and stops syncing to the logs.
 
 ## Client Search
diff --git a/dendrite-config.yaml b/dendrite-config.yaml
index a8d39aa1e..cbbfb87ee 100644
--- a/dendrite-config.yaml
+++ b/dendrite-config.yaml
@@ -114,7 +114,7 @@ listen:
     public_rooms_api: "localhost:7775"
     federation_sender: "localhost:7776"
     appservice_api: "localhost:7777"
-    typing_server: "localhost:7778"
+    edu_server: "localhost:7778"
 
 # The configuration for tracing the dendrite components.
 tracing:
diff --git a/docker/README.md b/docker/README.md
index ee4f0f96f..83d0b6a87 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -58,7 +58,7 @@ docker-compose up kafka zookeeper postgres
 and the following dendrite components 
 
 ```
-docker-compose up client_api media_api sync_api room_server public_rooms_api typing_server
+docker-compose up client_api media_api sync_api room_server public_rooms_api edu_server
 docker-compose up client_api_proxy
 ```
 
diff --git a/docker/dendrite-docker.yml b/docker/dendrite-docker.yml
index abb8c3307..b13ae8c3b 100644
--- a/docker/dendrite-docker.yml
+++ b/docker/dendrite-docker.yml
@@ -114,7 +114,7 @@ listen:
     media_api: "media_api:7774"
     public_rooms_api: "public_rooms_api:7775"
     federation_sender: "federation_sender:7776"
-    typing_server: "typing_server:7777"
+    edu_server: "typing_server:7777"
 
 # The configuration for tracing the dendrite components.
 tracing:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d738ed3f0..957c3bf3f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -103,10 +103,10 @@ services:
     networks:
       - internal
 
-  typing_server:
-    container_name: dendrite_typing_server
-    hostname: typing_server
-    entrypoint: ["bash", "./docker/services/typing-server.sh"]
+  edu_server:
+    container_name: dendrite_edu_server
+    hostname: edu_server
+    entrypoint: ["bash", "./docker/services/edu-server.sh"]
     build: ./
     volumes:
       - ..:/build
diff --git a/docker/services/edu-server.sh b/docker/services/edu-server.sh
new file mode 100644
index 000000000..d40b9fa7e
--- /dev/null
+++ b/docker/services/edu-server.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+bash ./docker/build.sh
+
+./bin/dendrite-edu-server --config=dendrite.yaml
diff --git a/docker/services/typing-server.sh b/docker/services/typing-server.sh
deleted file mode 100644
index 16ee0fa62..000000000
--- a/docker/services/typing-server.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-bash ./docker/build.sh
-
-./bin/dendrite-typing-server --config=dendrite.yaml