database config is not kept in separate config file anymore

This commit is contained in:
Mark Haines 2015-05-01 14:06:43 +01:00
parent 7b50769eb9
commit 32937f3ea0
1 changed files with 9 additions and 13 deletions

View File

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