From c64a507691f2da61154fb129b6e889974c51b24c Mon Sep 17 00:00:00 2001 From: strawberry Date: Wed, 15 May 2024 11:53:30 -0400 Subject: [PATCH] correct default database path to `/var/lib/conduwuit` Signed-off-by: strawberry --- conduwuit-example.toml | 5 +++-- debian/postinst | 3 +++ docs/deploying/docker-compose.for-traefik.yml | 6 +++--- docs/deploying/docker-compose.yml | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/conduwuit-example.toml b/conduwuit-example.toml index 90a84ac1..910ebe8f 100644 --- a/conduwuit-example.toml +++ b/conduwuit-example.toml @@ -60,8 +60,9 @@ ### Database configuration -# This is the only directory where conduwuit will save its data, including media -database_path = "/var/lib/matrix-conduit/" +# This is the only directory where conduwuit will save its data, including media. +# Note: this was previously "/var/lib/matrix-conduit" +database_path = "/var/lib/conduwuit" # Database backend: Only rocksdb and sqlite are supported. Please note that sqlite # will perform significantly worse than rocksdb as it is not intended to be used the diff --git a/debian/postinst b/debian/postinst index 9383bbac..d07ad36b 100644 --- a/debian/postinst +++ b/debian/postinst @@ -25,6 +25,9 @@ case "$1" in # and permissions for the config. mkdir -v -p "$CONDUWUIT_DATABASE_PATH" + # symlink the previous location for compatibility + ln -s -v "$CONDUWUIT_DATABASE_PATH" "/var/lib/matrix-conduit" + chown -v conduwuit:conduwuit -R "$CONDUWUIT_DATABASE_PATH" chown -v conduwuit:conduwuit -R "$CONDUWUIT_CONFIG_PATH" chown -v conduwuit:conduwuit -R "$CONDUWUIT_CONFIG_FILE" diff --git a/docs/deploying/docker-compose.for-traefik.yml b/docs/deploying/docker-compose.for-traefik.yml index 70f4bb0c..84d7ea59 100644 --- a/docs/deploying/docker-compose.for-traefik.yml +++ b/docs/deploying/docker-compose.for-traefik.yml @@ -3,7 +3,7 @@ version: '2.4' # uses '2.4' for cpuset services: homeserver: - ### If you already built the Conduit image with 'docker build' or want to use the Docker Hub image, + ### If you already built the conduduwit image with 'docker build' or want to use the Docker Hub image, ### then you are ready to go. image: girlbossceo/conduwuit:latest ### If you want to build a fresh image from the sources, then comment the image line and uncomment the @@ -18,13 +18,13 @@ services: # GIT_REF: origin/master restart: unless-stopped volumes: - - db:/var/lib/matrix-conduit + - db:/var/lib/conduwuit #- ./conduwuit.toml:/etc/conduit.toml networks: - proxy environment: CONDUIT_SERVER_NAME: your.server.name # EDIT THIS - CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit + CONDUIT_DATABASE_PATH: /var/lib/conduwuit CONDUIT_DATABASE_BACKEND: rocksdb CONDUIT_PORT: 6167 CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB diff --git a/docs/deploying/docker-compose.yml b/docs/deploying/docker-compose.yml index c386b77f..1d80c677 100644 --- a/docs/deploying/docker-compose.yml +++ b/docs/deploying/docker-compose.yml @@ -20,11 +20,11 @@ services: ports: - 8448:6167 volumes: - - db:/var/lib/matrix-conduit + - db:/var/lib/conduwuit #- ./conduwuit.toml:/etc/conduit.toml environment: CONDUIT_SERVER_NAME: your.server.name # EDIT THIS - CONDUIT_DATABASE_PATH: /var/lib/matrix-conduit + CONDUIT_DATABASE_PATH: /var/lib/conduwuit CONDUIT_DATABASE_BACKEND: rocksdb CONDUIT_PORT: 6167 CONDUIT_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB