From 812c44be6314a06a91eaf9ca99a9f4f27354f037 Mon Sep 17 00:00:00 2001 From: Greg Burd Date: Thu, 26 Oct 2023 12:07:20 -0400 Subject: [PATCH] tweaks --- dendrite/Dockerfile | 2 +- dendrite/TODO | 2 ++ dendrite/dendrite.in.yaml | 4 ++-- shell.nix | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dendrite/Dockerfile b/dendrite/Dockerfile index 035c95c..82b3b46 100644 --- a/dendrite/Dockerfile +++ b/dendrite/Dockerfile @@ -1,6 +1,6 @@ FROM matrixdotorg/dendrite-monolith:v0.13.3 -RUN apk --update --no-cache add envsubst tini +RUN apk --update --no-cache add envsubst tini postgresql-client COPY dendrite.in.yaml /etc/dendrite/ COPY docker-entrypoint.sh / diff --git a/dendrite/TODO b/dendrite/TODO index 7c0aa80..e434c44 100644 --- a/dendrite/TODO +++ b/dendrite/TODO @@ -1,3 +1,5 @@ +* file upload/download +* 3pid/email/requestToken untrusted server '' thirdpid config of phone and email failing * video/voice calls https://landchad.net/coturn/ https://landchad.net/dendrite/ diff --git a/dendrite/dendrite.in.yaml b/dendrite/dendrite.in.yaml index 6846866..22ba9f0 100644 --- a/dendrite/dendrite.in.yaml +++ b/dendrite/dendrite.in.yaml @@ -108,7 +108,7 @@ global: trusted_third_party_id_servers: - matrix.org - vector.im - - burd.me + - matrix.burd.me # Disables federation. Dendrite will not be able to communicate with other servers # in the Matrix federation and the federation API will not be exposed. @@ -340,7 +340,7 @@ sync_api: # This option controls which HTTP header to inspect to find the real remote IP # address of the client. This is likely required if Dendrite is running behind # a reverse proxy server. - # real_ip_header: X-Real-IP + real_ip_header: X-Client-IP # Configuration for the full-text search engine. search: diff --git a/shell.nix b/shell.nix index e74aab0..93c6bd8 100644 --- a/shell.nix +++ b/shell.nix @@ -5,6 +5,7 @@ pkgs.mkShell { nativeBuildInputs = with pkgs.buildPackages; [ ripgrep envsubst + postgresql ]; DOCKER_BUILDKIT = 1; }