summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-03-20 16:24:22 +0100
committerGitHub <noreply@github.com>2020-03-20 15:24:22 +0000
commitc165c1233b8ef244fadca97c7d465fdcf473d077 (patch)
treeb8093f0e41eebb849350a434b14fcdfe0b61d6c1 /synapse/config/_base.py
parentRemove concept of a non-limited stream. (#7011) (diff)
downloadsynapse-c165c1233b8ef244fadca97c7d465fdcf473d077.tar.xz
Improve database configuration docs (#6988)
Attempts to clarify the sample config for databases, and add some stuff about
tcp keepalives to `postgres.md`.
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r--synapse/config/_base.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index ba846042c4..efe2af5504 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -294,7 +294,6 @@ class RootConfig(object):
         report_stats=None,
         open_private_ports=False,
         listeners=None,
-        database_conf=None,
         tls_certificate_path=None,
         tls_private_key_path=None,
         acme_domain=None,
@@ -367,7 +366,6 @@ class RootConfig(object):
                 report_stats=report_stats,
                 open_private_ports=open_private_ports,
                 listeners=listeners,
-                database_conf=database_conf,
                 tls_certificate_path=tls_certificate_path,
                 tls_private_key_path=tls_private_key_path,
                 acme_domain=acme_domain,