char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'mdformatting' into 'master'

Browse source 
docs: Fix markdown formatting in DEPLOY.md

See merge request famedly/conduit!58
This commit is contained in:
Timo Kösters 2021-04-16 09:24:52 +00:00
commit 6d109b9902
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CROSS_COMPILE.md
View file

@ -1,4 +1,5 @@
Install docker: Install docker:
``` ```
$ sudo apt install docker $ sudo apt install docker
$ sudo usermod -aG docker $USER $ sudo usermod -aG docker $USER

9
DEPLOY.md
View file

@ -53,6 +53,7 @@ WantedBy=multi-user.target
``` ```
Finally, run Finally, run
```bash ```bash
$ sudo systemctl daemon-reload $ sudo systemctl daemon-reload
``` ```
@ -61,6 +62,7 @@ $ sudo systemctl daemon-reload
## Creating the Conduit configuration file ## 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.** 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 ```toml
[global] [global]
# The server_name is the name of this server. It is used as a suffix for user # 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 ### Apache
Create `/etc/apache2/sites-enabled/050-conduit.conf` and copy-and-paste this: Create `/etc/apache2/sites-enabled/050-conduit.conf` and copy-and-paste this:
``` ```
Listen 8448 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 **You need to make some edits again.** When you are done, run
```bash ```bash
$ sudo systemctl reload apache2 $ 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 If you use Nginx and not Apache, add the following server section inside the
http section of `/etc/nginx/nginx.conf` http section of `/etc/nginx/nginx.conf`
``` ```
server { server {
listen 443; listen 443;
@ -164,6 +169,7 @@ server {
} }
``` ```
**You need to make some edits again.** When you are done, run **You need to make some edits again.** When you are done, run
```bash ```bash
$ sudo systemctl reload nginx $ sudo systemctl reload nginx
``` ```
@ -172,6 +178,7 @@ $ sudo systemctl reload nginx
## SSL Certificate ## SSL Certificate
The easiest way to get an SSL certificate, if you don't have one already, is to install `certbot` and run this: The easiest way to get an SSL certificate, if you don't have one already, is to install `certbot` and run this:
```bash ```bash
$ sudo certbot -d your.server.name $ sudo certbot -d your.server.name
``` ```
@ -180,11 +187,13 @@ $ sudo certbot -d your.server.name
## You're done! ## You're done!
Now you can start Conduit with: Now you can start Conduit with:
```bash ```bash
$ sudo systemctl start conduit $ sudo systemctl start conduit
``` ```
Set it to start automatically when your system boots with: Set it to start automatically when your system boots with:
```bash ```bash
$ sudo systemctl enable conduit $ sudo systemctl enable conduit
``` ```