From 0e62fcd0eb39d9e4251cb5a9955a50ec8c376a26 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Tue, 1 Jan 2019 15:27:18 -0600 Subject: [PATCH 1/3] Update README to use new virtualenv (#4328) Signed-off-by: Aaron Raimist --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index c4df779ac7..cc3eb585b7 100644 --- a/README.rst +++ b/README.rst @@ -184,7 +184,7 @@ Configuring Synapse Before you can start Synapse, you will need to generate a configuration file. To do this, run (in your virtualenv, as before):: - cd ~/.synapse + cd ~/synapse python -m synapse.app.homeserver \ --server-name my.domain.name \ --config-path homeserver.yaml \ @@ -796,7 +796,7 @@ A manual password reset can be done via direct database access as follows. First calculate the hash of the new password:: - $ source ~/.synapse/bin/activate + $ source ~/synapse/env/bin/activate $ ./scripts/hash_password Password: Confirm password: From 7975d39cbd8829794e0f294673676dac92ca64f4 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Tue, 1 Jan 2019 15:40:49 -0600 Subject: [PATCH 2/3] Add changelog Signed-off-by: Aaron Raimist --- changelog.d/4342.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4342.misc diff --git a/changelog.d/4342.misc b/changelog.d/4342.misc new file mode 100644 index 0000000000..a4fda47c20 --- /dev/null +++ b/changelog.d/4342.misc @@ -0,0 +1 @@ +Update README to use the new virtualenv everywhere \ No newline at end of file From dd3bf401523885b439c012876db4e2f0c7877ef3 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Wed, 2 Jan 2019 16:36:29 +0000 Subject: [PATCH 3/3] README.rst: fix hash_password path --- README.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.rst b/README.rst index cc3eb585b7..bae7da38b1 100644 --- a/README.rst +++ b/README.rst @@ -796,8 +796,7 @@ A manual password reset can be done via direct database access as follows. First calculate the hash of the new password:: - $ source ~/synapse/env/bin/activate - $ ./scripts/hash_password + $ ~/synapse/env/bin/hash_password Password: Confirm password: $2a$12$xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx