summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-01 14:06:43 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-01 14:06:54 +0100
commit32937f3ea03dd163bbcdc6f39efe22ffb760e0d6 (patch)
treee53b828bff6cbf8625a98d8e97c39bdf31c1f4b2 /docs
parentMerge pull request #136 from matrix-org/markjh/config_cleanup (diff)
downloadsynapse-32937f3ea03dd163bbcdc6f39efe22ffb760e0d6.tar.xz
database config is not kept in separate config file anymore
Diffstat (limited to 'docs')
-rw-r--r--docs/postgres.rst22
1 files changed, 9 insertions, 13 deletions
diff --git a/docs/postgres.rst b/docs/postgres.rst

index d645e1d697..2dcc3caf9e 100644 --- a/docs/postgres.rst +++ b/docs/postgres.rst
@@ -34,19 +34,15 @@ Synapse config When you are ready to start using PostgreSQL, add the following line to your config file:: - database_config: <db_config_file> - -Where ``<db_config_file>`` is the file name that points to a yaml file of the -following form:: - - name: psycopg2 - args: - user: <user> - password: <pass> - database: <db> - host: <host> - cp_min: 5 - cp_max: 10 + database: + name: psycopg2 + args: + user: <user> + password: <pass> + database: <db> + host: <host> + cp_min: 5 + cp_max: 10 All key, values in ``args`` are passed to the ``psycopg2.connect(..)`` function, except keys beginning with ``cp_``, which are consumed by the twisted