diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-08-20 16:08:05 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-08-20 16:08:05 +0100 |
| commit | cb8201ba120e5ca17a7fbdb90799ccb5909aecb1 (patch) | |
| tree | 5cbb1c147959b9f5f0f159671fea4df372383b6f | |
| parent | Update changelog (diff) | |
| parent | Tweak the wording a bit (diff) | |
| download | synapse-cb8201ba120e5ca17a7fbdb90799ccb5909aecb1.tar.xz | |
Merge pull request #236 from matrix-org/markjh/upgrade-instructions
Add generic update instructions to UPGRADE.rst
| -rw-r--r-- | README.rst | 11 | ||||
| -rw-r--r-- | UPGRADE.rst | 33 |
2 files changed, 37 insertions, 7 deletions
diff --git a/README.rst b/README.rst index 5ff53f2df7..b01d693a47 100644 --- a/README.rst +++ b/README.rst @@ -362,14 +362,11 @@ This should end with a 'PASSED' result:: Upgrading an existing Synapse ============================= -IMPORTANT: Before upgrading an existing synapse to a new version, please -refer to UPGRADE.rst for any additional instructions. - -Otherwise, simply re-install the new codebase over the current one - e.g. -by ``pip install --process-dependency-links -https://github.com/matrix-org/synapse/tarball/master`` -if using pip, or by ``git pull`` if running off a git working copy. +The instructions for upgrading synapse are in `UPGRADE.rst`_. +Please check these instructions as upgrading may require extra steps for some +versions of synapse. +.. _UPGRADE.rst: UPGRADE.rst Setting up Federation ===================== diff --git a/UPGRADE.rst b/UPGRADE.rst index d98460f643..35a0333a7e 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -1,3 +1,36 @@ +Upgrading Synapse +================= + +Before upgrading check if any special steps are required to upgrade from the +what you currently have installed to current version of synapse. The extra +instructions that may be required are listed later in this document. + +If synapse was installed in a virtualenv then active that virtualenv before +upgrading. If synapse is installed in a virtualenv in ``~/.synapse/`` then run: + +.. code:: bash + + source ~/.synapse/bin/activate + +If synapse was installed using pip then upgrade to the latest version by +running: + +.. code:: bash + + pip install --upgrade --process-dependency-links https://github.com/matrix-org/synapse/tarball/master + +If synapse was installed using git then upgrade to the latest version by +running: + +.. code:: bash + + # Pull the latest version of the master branch. + git pull + # Update the versions of synapse's python dependencies. + python synapse/python_dependencies.py | xargs -n1 pip install + + + Upgrading to v0.9.0 =================== |