diff options
| author | Kegsay <kegan@matrix.org> | 2020-03-30 15:02:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 15:02:20 +0100 |
| commit | 11a8059bba9dbdc855f10e3b380c4a2f245635a2 (patch) | |
| tree | 61b2ffaa53eecb6d4eef8e275f432734cbb9e606 /docker | |
| parent | f72b759426c1895b76c16ace526cc788713c2fea (diff) | |
Rename the typing server to EDU server (#948)
* Blunt move and sed rename
* Rename common/ refs to typing
* Rename internal stuff in eduserver
* Rename docs and scripts
* Rename constants/filenames, goimports everything to re-order imports
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/README.md | 2 | ||||
| -rw-r--r-- | docker/dendrite-docker.yml | 4 | ||||
| -rw-r--r-- | docker/docker-compose.yml | 8 | ||||
| -rw-r--r-- | docker/services/edu-server.sh | 5 | ||||
| -rw-r--r-- | docker/services/typing-server.sh | 5 |
5 files changed, 12 insertions, 12 deletions
diff --git a/docker/README.md b/docker/README.md index ee4f0f96..83d0b6a8 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 abb8c330..a72ff3dd 100644 --- a/docker/dendrite-docker.yml +++ b/docker/dendrite-docker.yml @@ -85,7 +85,7 @@ kafka: topics: output_room_event: roomserverOutput output_client_data: clientapiOutput - output_typing_event: typingServerOutput + output_typing_event: eduServerOutput user_updates: userUpdates @@ -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 d738ed3f..957c3bf3 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 00000000..d40b9fa7 --- /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 16ee0fa6..00000000 --- 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 |