Suggestions from Jonas Zohren

merge-requests/301/head
Jonas Zohren 2 years ago
parent de6c3312ce
commit c4353405a5
No known key found for this signature in database
GPG Key ID: FE3ED5D90A175463

@ -148,8 +148,8 @@ sudo chown -R conduit:nogroup /etc/matrix-conduit
If you use the default database path you also need to run this: If you use the default database path you also need to run this:
```bash ```bash
sudo mkdir -p /var/lib/matrix-conduit/conduit_db sudo mkdir -p /var/lib/matrix-conduit/
sudo chown -R conduit:nogroup /var/lib/matrix-conduit/conduit_db sudo chown -R conduit:nogroup /var/lib/matrix-conduit/
``` ```
## Setting up the Reverse Proxy ## Setting up the Reverse Proxy

2
debian/postinst vendored

@ -5,7 +5,7 @@ set -e
CONDUIT_CONFIG_PATH=/etc/matrix-conduit CONDUIT_CONFIG_PATH=/etc/matrix-conduit
CONDUIT_CONFIG_FILE="${CONDUIT_CONFIG_PATH}/conduit.toml" CONDUIT_CONFIG_FILE="${CONDUIT_CONFIG_PATH}/conduit.toml"
CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit/conduit_db CONDUIT_DATABASE_PATH=/var/lib/matrix-conduit/
case "$1" in case "$1" in
configure) configure)

@ -21,9 +21,6 @@ services:
- 8448:6167 - 8448:6167
volumes: volumes:
- db:/var/lib/matrix-conduit/ - db:/var/lib/matrix-conduit/
### Uncomment if you want to use conduit.toml to configure Conduit
### Note: Set env vars will override conduit.toml values
# - ./conduit.toml:/srv/conduit/conduit.toml
environment: environment:
CONDUIT_SERVER_NAME: your.server.name # EDIT THIS CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/ CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/

@ -24,7 +24,7 @@ which also will tag the resulting image as `matrixconduit/matrix-conduit:latest`
After building the image you can simply run it with After building the image you can simply run it with
```bash ```bash
docker run -d -p 8448:6167 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/srv/conduit/.local/share/conduit matrixconduit/matrix-conduit:latest docker run -d -p 8448:6167 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/var/lib/matrix-conduit/ matrixconduit/matrix-conduit:latest
``` ```
or you can skip the build step and pull the image from one of the following registries: or you can skip the build step and pull the image from one of the following registries:

Loading…
Cancel
Save