diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-12 13:10:42 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-12 13:10:42 +0100 |
| commit | da6a7bbdde73c5182a08a8f6253dc77761d9fc5f (patch) | |
| tree | de515e4104613e4abbe0f523904f055078fc48af /docs | |
| parent | Fix up leak. Add warnings. (diff) | |
| parent | Merge pull request #148 from matrix-org/bugs/SYN-377 (diff) | |
| download | synapse-da6a7bbdde73c5182a08a8f6253dc77761d9fc5f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/logging_context
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/application_services.rst | 2 | ||||
| -rw-r--r-- | docs/postgres.rst | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/application_services.rst b/docs/application_services.rst index a57bae6194..7e87ac9ad6 100644 --- a/docs/application_services.rst +++ b/docs/application_services.rst @@ -20,7 +20,7 @@ The format of the AS configuration file is as follows: url: <base url of AS> as_token: <token AS will add to requests to HS> - hs_token: <token HS will ad to requests to AS> + hs_token: <token HS will add to requests to AS> sender_localpart: <localpart of AS user> namespaces: users: # List of users we're interested in diff --git a/docs/postgres.rst b/docs/postgres.rst index 2dcc3caf9e..19d8391115 100644 --- a/docs/postgres.rst +++ b/docs/postgres.rst @@ -82,13 +82,13 @@ complete, restart synapse. For instance:: cp homeserver.db homeserver.db.snapshot ./synctl start -Assuming your database config file (as described in the section *Synapse -config*) is named ``database_config.yaml`` and the SQLite snapshot is at +Assuming your new config file (as described in the section *Synapse config*) +is named ``homeserver-postgres.yaml`` and the SQLite snapshot is at ``homeserver.db.snapshot`` then simply run:: python scripts/port_from_sqlite_to_postgres.py \ --sqlite-database homeserver.db.snapshot \ - --postgres-config database_config.yaml + --postgres-config homeserver-postgres.yaml The flag ``--curses`` displays a coloured curses progress UI. |