From 3c92b55bec57519dfd5b5a0f06c32b3ae85f5710 Mon Sep 17 00:00:00 2001 From: FORCHA Date: Fri, 21 Jan 2022 15:37:59 +0100 Subject: [PATCH 1/3] Update monolith-sample.conf (#2087) * Update monolith-sample.conf -Replaced undefined monolith value with server_name (my.hostname.com) value in reference tho ths issue https://github.com/matrix-org/dendrite/issues/2078 * Update monolith-sample.conf Changed IP to location of monolith server Co-authored-by: kegsay --- docs/nginx/monolith-sample.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/nginx/monolith-sample.conf b/docs/nginx/monolith-sample.conf index 0344aa96c..360eb9255 100644 --- a/docs/nginx/monolith-sample.conf +++ b/docs/nginx/monolith-sample.conf @@ -1,3 +1,7 @@ +#change IP to location of monolith server +upstream monolith{ + server 127.0.0.1:8008; +} server { listen 443 ssl; # IPv4 listen [::]:443 ssl; # IPv6 @@ -23,6 +27,6 @@ server { } location /_matrix { - proxy_pass http://monolith:8008; + proxy_pass http://monolith; } } From cd1391fc62d9801b2246e38e3491f52fba585fff Mon Sep 17 00:00:00 2001 From: kegsay Date: Fri, 21 Jan 2022 14:46:47 +0000 Subject: [PATCH 2/3] Document log levels (#2101) --- dendrite-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/dendrite-config.yaml b/dendrite-config.yaml index 7593988f3..38b146d70 100644 --- a/dendrite-config.yaml +++ b/dendrite-config.yaml @@ -368,6 +368,7 @@ logging: - type: std level: info - type: file + # The logging level, must be one of debug, info, warn, error, fatal, panic. level: info params: path: ./logs From 96bf4aa8383e13624b823806b07a5878c8b3ade3 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 21 Jan 2022 14:59:47 +0000 Subject: [PATCH 3/3] Add `Forward extremities remain so even after the next events are populated as outliers` to `sytest-whitelist` --- sytest-whitelist | 1 + 1 file changed, 1 insertion(+) diff --git a/sytest-whitelist b/sytest-whitelist index 558eb29a6..f11cd96bf 100644 --- a/sytest-whitelist +++ b/sytest-whitelist @@ -588,3 +588,4 @@ User can invite remote user to room with version 9 Remote user can backfill in a room with version 9 Can reject invites over federation for rooms with version 9 Can receive redactions from regular users over federation in room version 9 +Forward extremities remain so even after the next events are populated as outliers