Merge pull request #3340 from ArchangeGabriel/patch-1

doc/postgres.rst: fix display of the last command block
This commit is contained in:
Richard van der Hoff 2018-06-05 17:45:17 +01:00 committed by GitHub
commit 617afee069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,19 +9,19 @@ Set up database
Assuming your PostgreSQL database user is called ``postgres``, create a user Assuming your PostgreSQL database user is called ``postgres``, create a user
``synapse_user`` with:: ``synapse_user`` with::
su - postgres su - postgres
createuser --pwprompt synapse_user createuser --pwprompt synapse_user
The PostgreSQL database used *must* have the correct encoding set, otherwise it The PostgreSQL database used *must* have the correct encoding set, otherwise it
would not be able to store UTF8 strings. To create a database with the correct would not be able to store UTF8 strings. To create a database with the correct
encoding use, e.g.:: encoding use, e.g.::
CREATE DATABASE synapse CREATE DATABASE synapse
ENCODING 'UTF8' ENCODING 'UTF8'
LC_COLLATE='C' LC_COLLATE='C'
LC_CTYPE='C' LC_CTYPE='C'
template=template0 template=template0
OWNER synapse_user; OWNER synapse_user;
This would create an appropriate database named ``synapse`` owned by the This would create an appropriate database named ``synapse`` owned by the
``synapse_user`` user (which must already exist). ``synapse_user`` user (which must already exist).
@ -126,7 +126,7 @@ run::
--postgres-config homeserver-postgres.yaml --postgres-config homeserver-postgres.yaml
Once that has completed, change the synapse config to point at the PostgreSQL Once that has completed, change the synapse config to point at the PostgreSQL
database configuration file ``homeserver-postgres.yaml``: database configuration file ``homeserver-postgres.yaml``::
./synctl stop ./synctl stop
mv homeserver.yaml homeserver-old-sqlite.yaml mv homeserver.yaml homeserver-old-sqlite.yaml