mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-31 18:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into neilalexander/inputtweaks

Browse source
This commit is contained in:
Neil Alexander 2022-01-21 15:00:10 +00:00
parent e02fa90608 96bf4aa838
commit f3ee072660
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dendrite-config.yaml
View file

@ -368,6 +368,7 @@ logging:
- type: std - type: std
level: info level: info
- type: file - type: file
# The logging level, must be one of debug, info, warn, error, fatal, panic.
level: info level: info
params: params:
path: ./logs path: ./logs

6
docs/nginx/monolith-sample.conf
View file

@ -1,3 +1,7 @@
#change IP to location of monolith server
upstream monolith{
server 127.0.0.1:8008;
}
server { server {
listen 443 ssl; # IPv4 listen 443 ssl; # IPv4
listen [::]:443 ssl; # IPv6 listen [::]:443 ssl; # IPv6
@ -23,6 +27,6 @@ server {
} }
location /_matrix { location /_matrix {
proxy_pass http://monolith:8008; proxy_pass http://monolith;
} }
} }

1
sytest-whitelist
View file

@ -588,3 +588,4 @@ User can invite remote user to room with version 9
Remote user can backfill in a 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 reject invites over federation for rooms with version 9
Can receive redactions from regular users over federation in room 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