From 875b345a5f770251b640035c41148d2481beb3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20K=C3=B6sters?= Date: Wed, 1 Sep 2021 13:09:24 +0200 Subject: [PATCH] docs: update readme and version --- Cargo.lock | 2 +- Cargo.toml | 2 +- DEPLOY.md | 11 ++++++ README.md | 72 +++++++----------------------------- src/client_server/account.rs | 4 +- 5 files changed, 28 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8037aa5..13d027e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -236,7 +236,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "conduit" -version = "0.1.0" +version = "0.2.0" dependencies = [ "base64 0.13.0", "bytes", diff --git a/Cargo.toml b/Cargo.toml index ca802e9..4a90a4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ authors = ["timokoesters "] homepage = "https://conduit.rs" repository = "https://gitlab.com/famedly/conduit" readme = "README.md" -version = "0.1.0" +version = "0.2.0" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/DEPLOY.md b/DEPLOY.md index 8218b45..3a81eb0 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -231,4 +231,15 @@ Set it to start automatically when your system boots with: $ sudo systemctl enable conduit ``` +## How do I know it works? + +You can open , enter your homeserver and try to register. + +You can also use these commands as a quick health check. + +```bash +$ 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). diff --git a/README.md b/README.md index 836f9c6..34344c9 100644 --- a/README.md +++ b/README.md @@ -3,37 +3,26 @@ #### What is the goal? -A fast Matrix homeserver that's easy to set up and just works. You can install +An efficient Matrix homeserver that's easy to set up and just works. You can install it on a mini-computer like the Raspberry Pi to host Matrix for your family, friends or company. #### Can I try it out? -Yes! Just open a Matrix client ( or Element Android for -example) and register on the `https://conduit.koesters.xyz` homeserver. +Yes! You can test our Conduit instance by opening a Matrix client ( or Element Android for +example) and registering on the `conduit.rs` homeserver. - -#### What is it built on? - -- [Ruma](https://www.ruma.io): Useful structures for endpoint requests and - responses that can be (de)serialized -- [Sled](https://github.com/spacejam/sled): A simple (key, value) database with - good performance -- [Rocket](https://rocket.rs): A flexible web framework +It is hosted on a ODROID HC 2 with 2GB RAM and a SAMSUNG Exynos 5422 CPU, which +was used in the Samsung Galaxy S5. It joined many big rooms including Matrix +HQ. #### What is the current status? -Conduit can already be used chat with other users on Conduit, chat with users -from other Matrix servers and even to chat with users on other platforms using -appservices. When chatting with users on the same Conduit server, everything -should work assuming you use a compatible client. - -**You should not join Matrix rooms without asking the admins first.** We do not -know whether Conduit is safe for general use yet, so you should assume there is -some chance that it breaks rooms permanently for all participating users. We -are not aware of such a bug today, but we would like to do more testing. +As of 2021-09-01 Conduit is Beta, meaning you can join and participate in most +Matrix rooms, but not all features are supported and you might run into bugs +from time to time. There are still a few important features missing: @@ -47,46 +36,11 @@ Check out the [Conduit 1.0 Release Milestone](https://gitlab.com/famedly/conduit #### How can I deploy my own? -##### Deploy +Simple install (this was tested the most): [DEPLOY.md](DEPLOY.md)\ +Debian package: [debian/README.Debian](debian/README.Debian)\ +Docker: [docker/README.md](docker/README.md) -Download or compile a Conduit binary, set up the config and call it from somewhere like a systemd script. [Read -more](DEPLOY.md) - -If you want to connect an Appservice to Conduit, take a look at the [Appservice Guide](APPSERVICES.md). - -##### Deploy using a Debian package - -You need to have the `deb` helper command installed that creates Debian packages from Cargo projects (see [cargo-deb](https://github.com/mmstick/cargo-deb/) for more info): - -```shell -$ cargo install cargo-deb -``` - -Then, you can create and install a Debian package at a whim: - -```shell -$ cargo deb -$ dpkg -i target/debian/matrix-conduit_0.1.0_amd64.deb -``` - -This will build, package, install, configure and start Conduit. [Read more](debian/README.Debian). - -Note that `cargo deb` supports [cross-compilation](https://github.com/mmstick/cargo-deb/#cross-compilation) too! -Official Debian packages will follow once Conduit starts to have stable releases. - -##### Deploy using Docker - -Pull and run the docker image with - -``` bash -docker pull matrixconduit/matrix-conduit:latest -docker run -d -p 8448:6167 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/srv/conduit/.local/share/conduit matrixconduit/matrix-conduit:latest -``` - -> Note: You also need to supply a `conduit.toml` config file, you can find an example [here](./conduit-example.toml). -> Or you can pass in `-e CONDUIT_CONFIG=""` and configure Conduit purely with env vars. - -Or build and run it with docker or docker-compose. [Read more](docker/README.md) +If you want to connect an Appservice to Conduit, take a look at [APPSERVICES.md](APPSERVICES.md). #### How can I contribute? diff --git a/src/client_server/account.rs b/src/client_server/account.rs index 4b610a3..e9300b5 100644 --- a/src/client_server/account.rs +++ b/src/client_server/account.rs @@ -507,8 +507,8 @@ pub async fn register_route( PduBuilder { event_type: EventType::RoomMessage, content: serde_json::to_value(message::MessageEventContent::text_html( - "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing `/join #conduit:matrix.org`. **Important: Please don't join any other Matrix rooms over federation without permission from the room's admins.** Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(), - "Thanks for trying out Conduit! This software is still in development, so expect many bugs and missing features. If you have federation enabled, you can join the Conduit chat room by typing /join #conduit:matrix.org. Important: Please don't join any other Matrix rooms over federation without permission from the room's admins. Some actions might trigger bugs in other server implementations, breaking the chat for everyone else.".to_owned(), + "## Thank you for trying out Conduit!\n\nConduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.\n\nHelpful links:\n> Website: https://conduit.rs\n> Git and Documentation: https://gitlab.com/famedly/conduit\n> Report issues: https://gitlab.com/famedly/conduit/-/issues\n\nHere are some rooms you can join (by typing the command):\n\nConduit room (Ask questions and get notified on updates):\n`/join #conduit:fachschaften.org`\n\nConduit lounge (Off-topic, only Conduit users are allowed to join)\n`/join #conduit-lounge:conduit.rs`".to_owned(), + "

Thank you for trying out Conduit!

\n

Conduit is currently in Beta. This means you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time.

\n

Helpful links:

\n
\n

Website: https://conduit.rs
Git and Documentation: https://gitlab.com/famedly/conduit
Report issues: https://gitlab.com/famedly/conduit/-/issues

\n
\n

Here are some rooms you can join (by typing the command):

\n

Conduit room (Ask questions and get notified on updates):
/join #conduit:fachschaften.org

\n

Conduit lounge (Off-topic, only Conduit users are allowed to join)
/join #conduit-lounge:conduit.rs

\n".to_owned(), )) .expect("event is valid, we just created it"), unsigned: None,