From 95db30918ea4d8511fe8defa39f9fcb941ae314d Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Thu, 15 Apr 2021 23:08:13 +0200 Subject: [PATCH] docs: Fix fix formatting of code blocks in markdown --- CROSS_COMPILE.md | 1 + DEPLOY.md | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/CROSS_COMPILE.md b/CROSS_COMPILE.md index 4728768c..5bdfff41 100644 --- a/CROSS_COMPILE.md +++ b/CROSS_COMPILE.md @@ -1,4 +1,5 @@ Install docker: + ``` $ sudo apt install docker $ sudo usermod -aG docker $USER diff --git a/DEPLOY.md b/DEPLOY.md index 4601ab57..69597596 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -53,6 +53,7 @@ WantedBy=multi-user.target ``` Finally, run + ```bash $ sudo systemctl daemon-reload ``` @@ -61,6 +62,7 @@ $ sudo systemctl daemon-reload ## Creating the Conduit configuration file Now we need to create the Conduit's config file in `/etc/matrix-conduit/conduit.toml`. Paste this in **and take a moment to read it. You need to change at least the server name.** + ```toml [global] # The server_name is the name of this server. It is used as a suffix for user @@ -125,6 +127,7 @@ This depends on whether you use Apache, Nginx or another web server. ### Apache Create `/etc/apache2/sites-enabled/050-conduit.conf` and copy-and-paste this: + ``` Listen 8448 @@ -143,6 +146,7 @@ SSLCertificateKeyFile /etc/letsencrypt/live/your.server.name/privkey.pem # EDIT ``` **You need to make some edits again.** When you are done, run + ```bash $ sudo systemctl reload apache2 ``` @@ -152,6 +156,7 @@ $ sudo systemctl reload apache2 If you use Nginx and not Apache, add the following server section inside the http section of `/etc/nginx/nginx.conf` + ``` server { listen 443; @@ -164,6 +169,7 @@ server { } ``` **You need to make some edits again.** When you are done, run + ```bash $ sudo systemctl reload nginx ``` @@ -172,6 +178,7 @@ $ sudo systemctl reload nginx ## SSL Certificate The easiest way to get an SSL certificate, if you don't have one already, is to install `certbot` and run this: + ```bash $ sudo certbot -d your.server.name ``` @@ -180,11 +187,13 @@ $ sudo certbot -d your.server.name ## You're done! Now you can start Conduit with: + ```bash $ sudo systemctl start conduit ``` Set it to start automatically when your system boots with: + ```bash $ sudo systemctl enable conduit ```