diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-06-05 17:45:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 17:45:17 +0100 |
| commit | 617afee069d3113688256f5dca85aadfb5f968c3 (patch) | |
| tree | 0c58ac3ba743d4bd6c71ac5cf2bdebc1e8d931e5 /docs | |
| parent | Merge remote-tracking branch 'origin/master' into develop (diff) | |
| parent | doc/postgres.rest: fix displaying of the last command block (diff) | |
| download | synapse-617afee069d3113688256f5dca85aadfb5f968c3.tar.xz | |
Merge pull request #3340 from ArchangeGabriel/patch-1
doc/postgres.rst: fix display of the last command block
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/postgres.rst | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/postgres.rst b/docs/postgres.rst index 296293e859..2377542296 100644 --- a/docs/postgres.rst +++ b/docs/postgres.rst @@ -9,19 +9,19 @@ Set up database Assuming your PostgreSQL database user is called ``postgres``, create a user ``synapse_user`` with:: - su - postgres - createuser --pwprompt synapse_user + su - postgres + createuser --pwprompt synapse_user 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 encoding use, e.g.:: - CREATE DATABASE synapse - ENCODING 'UTF8' - LC_COLLATE='C' - LC_CTYPE='C' - template=template0 - OWNER synapse_user; + CREATE DATABASE synapse + ENCODING 'UTF8' + LC_COLLATE='C' + LC_CTYPE='C' + template=template0 + OWNER synapse_user; This would create an appropriate database named ``synapse`` owned by the ``synapse_user`` user (which must already exist). @@ -126,7 +126,7 @@ run:: --postgres-config homeserver-postgres.yaml 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 mv homeserver.yaml homeserver-old-sqlite.yaml |