mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 03:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

missing merges from the last dendrite refresh

Browse source
This commit is contained in:
Tak Wai Wong 2022-03-10 10:24:15 -08:00
parent 7a403ce839
commit cc75389ced
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/docker/config/dendrite.yaml
View file

@ -312,20 +312,6 @@ user_api:
max_open_conns: 10
max_idle_conns: 2
conn_max_lifetime: -1
<<<<<<< HEAD
# Configuration for the Push Server API.
push_server:
internal_api:
listen: http://localhost:7782
connect: http://localhost:7782
database:
connection_string: postgresql://dendrite:itsasecret@postgres/dendrite_pushserver?sslmode=disable
max_open_conns: 10
max_idle_conns: 2
conn_max_lifetime: -1
=======
>>>>>>> bc7a8b0600c5d121807b45a8be59dfd8731716c4
# Configuration for the Push Server API.
push_server:

8
setup/config/config_test.go
View file

@ -200,14 +200,6 @@ user_api:
max_open_conns: 100
max_idle_conns: 2
conn_max_lifetime: -1
<<<<<<< HEAD
pusher_database:
connection_string: file:pushserver.db
max_open_conns: 100
max_idle_conns: 2
conn_max_lifetime: -1
=======
>>>>>>> bc7a8b0600c5d121807b45a8be59dfd8731716c4
pusher_database:
connection_string: file:pushserver.db
max_open_conns: 100