summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Zohren <git-pbkyr@jzohren.de>2022-02-13 12:15:40 +0000
committerJonas Zohren <git-pbkyr@jzohren.de>2022-02-16 15:12:38 +0100
commitc4353405a5c457b8301de123c646e748a07f8a22 (patch)
tree6a2324e0005d8c072a50adb16ef4c30a5acc46ef
parentde6c3312ceca9d0f9c0d2041c16a46d6b538b2a6 (diff)
downloadconduit-c4353405a5c457b8301de123c646e748a07f8a22.zip
Suggestions from Jonas Zohren
-rw-r--r--DEPLOY.md4
-rw-r--r--debian/postinst2
-rw-r--r--docker-compose.yml3
-rw-r--r--docker/README.md2
4 files changed, 4 insertions, 7 deletions
diff --git a/DEPLOY.md b/DEPLOY.md
index 0657c0c..a28218d 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -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:
```bash
-sudo mkdir -p /var/lib/matrix-conduit/conduit_db
-sudo chown -R conduit:nogroup /var/lib/matrix-conduit/conduit_db
+sudo mkdir -p /var/lib/matrix-conduit/
+sudo chown -R conduit:nogroup /var/lib/matrix-conduit/
```
## Setting up the Reverse Proxy
diff --git a/debian/postinst b/debian/postinst
index 10d5561..378f99e 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,7 +5,7 @@ set -e
CONDUIT_CONFIG_PATH=/etc/matrix-conduit
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
configure)
diff --git a/docker-compose.yml b/docker-compose.yml
index 5a17a8d..0a9d8f4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,9 +21,6 @@ services:
- 8448:6167
volumes:
- 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:
CONDUIT_SERVER_NAME: your.server.name # EDIT THIS
CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit/
diff --git a/docker/README.md b/docker/README.md
index 14758fd..28ad06f 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -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
```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: