summaryrefslogtreecommitdiff
path: root/DEPLOY.md
diff options
context:
space:
mode:
authorTorsten Flammiger <git@netfg.net>2022-02-04 19:28:57 +0100
committerTorsten Flammiger <git@netfg.net>2022-02-04 19:28:57 +0100
commit1cc0b5565068b615fe9b9c20d253e54e47bffd35 (patch)
treeea40bf322f57851f4eb455fb278e6c1273123dff /DEPLOY.md
parent63a2c6cce5f01cfca8295a2ea5ad7f639bc257b8 (diff)
parent0cec4219302876e2308afa1bfa9d73b0da6c7bcc (diff)
downloadconduit-1cc0b5565068b615fe9b9c20d253e54e47bffd35.zip
Resolve merge conflict
Diffstat (limited to 'DEPLOY.md')
-rw-r--r--DEPLOY.md35
1 files changed, 16 insertions, 19 deletions
diff --git a/DEPLOY.md b/DEPLOY.md
index 4a0d0ab..8259b3f 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -1,9 +1,9 @@
# Deploying Conduit
-## Getting help
-
-If you run into any problems while setting up Conduit, write an email to `timo@koesters.xyz`, ask us
-in `#conduit:matrix.org` or [open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new).
+> ## Getting help
+>
+> If you run into any problems while setting up Conduit, write an email to `timo@koesters.xyz`, ask us
+> in `#conduit:fachschaften.org` or [open an issue on GitLab](https://gitlab.com/famedly/conduit/-/issues/new).
## Installing Conduit
@@ -12,17 +12,21 @@ only offer Linux binaries.
You may simply download the binary that fits your machine. Run `uname -m` to see what you need. Now copy the right url:
-| CPU Architecture | Download stable version |
-| ------------------------------------------- | ------------------------------ |
-| x84_64 / amd64 (Most servers and computers) | [Download][x84_64-musl-master] |
-| armv6 | [Download][armv6-musl-master] |
-| armv7 (e.g. Raspberry Pi by default) | [Download][armv7-musl-master] |
-| armv8 / aarch64 | [Download][armv8-musl-master] |
+| CPU Architecture | Download stable version | Download development version |
+| ------------------------------------------- | ------------------------------ | ---------------------------- |
+| x84_64 / amd64 (Most servers and computers) | [Download][x84_64-musl-master] | [Download][x84_64-musl-next] |
+| armv6 | [Download][armv6-musl-master] | [Download][armv6-musl-next] |
+| armv7 (e.g. Raspberry Pi by default) | [Download][armv7-musl-master] | [Download][armv7-musl-next] |
+| armv8 / aarch64 | [Download][armv8-musl-master] | [Download][armv8-musl-next] |
[x84_64-musl-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/conduit-x86_64-unknown-linux-musl?job=build:release:cargo:x86_64-unknown-linux-musl
[armv6-musl-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/conduit-arm-unknown-linux-musleabihf?job=build:release:cargo:arm-unknown-linux-musleabihf
[armv7-musl-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/conduit-armv7-unknown-linux-musleabihf?job=build:release:cargo:armv7-unknown-linux-musleabihf
[armv8-musl-master]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/conduit-aarch64-unknown-linux-musl?job=build:release:cargo:aarch64-unknown-linux-musl
+[x84_64-musl-next]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/next/raw/conduit-x86_64-unknown-linux-musl?job=build:release:cargo:x86_64-unknown-linux-musl
+[armv6-musl-next]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/next/raw/conduit-arm-unknown-linux-musleabihf?job=build:release:cargo:arm-unknown-linux-musleabihf
+[armv7-musl-next]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/next/raw/conduit-armv7-unknown-linux-musleabihf?job=build:release:cargo:armv7-unknown-linux-musleabihf
+[armv8-musl-next]: https://gitlab.com/famedly/conduit/-/jobs/artifacts/next/raw/conduit-aarch64-unknown-linux-musl?job=build:release:cargo:aarch64-unknown-linux-musl
```bash
$ sudo wget -O /usr/local/bin/matrix-conduit <url>
@@ -240,18 +244,11 @@ $ curl https://your.server.name/_matrix/client/versions
$ curl https://your.server.name:8448/_matrix/client/versions
```
-If you want to set up an appservice, take a look at the [Appservice Guide](APPSERVICES.md).
+- To check if your server can talk with other homeservers, you can use the [Matrix Federation Tester](https://federationtester.matrix.org/)
+- If you want to set up an appservice, take a look at the [Appservice Guide](APPSERVICES.md).
# What's next?
## Audio/Video calls
For Audio/Video call functionality see the [TURN Guide](TURN.md).
-As of 2022, Clients known to support a/v calls are
-
-* Element/Android
-* SchildiChat
-
-Clients known to not support a/v calls are
-
-* FluffyChat