aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-10-10 11:21:20 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-10-10 11:21:20 +0200
commit7c1ce28342c85abb21dc79b9d22be35c0c09891b (patch)
treeed27756ae40559f42ff796064f1c63691f494bcd /docs
parent7c1225347db8b516cc268709939f6b359bc283c1 (diff)
downloadwallabag-7c1ce28342c85abb21dc79b9d22be35c0c09891b.tar.gz
wallabag-7c1ce28342c85abb21dc79b9d22be35c0c09891b.tar.zst
wallabag-7c1ce28342c85abb21dc79b9d22be35c0c09891b.zip
Update upgrade documentation
Diffstat (limited to 'docs')
-rw-r--r--docs/en/user/upgrade-2.0.x-2.1.1.rst (renamed from docs/en/user/upgrade-2.0.x-2.1.y.rst)22
-rw-r--r--docs/en/user/upgrade-2.1.x-2.1.y.rst (renamed from docs/en/user/upgrade-2.0.x-2.0.y.rst)10
2 files changed, 11 insertions, 21 deletions
diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.1.rst
index ec353a18..898b4ccc 100644
--- a/docs/en/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/en/user/upgrade-2.0.x-2.1.1.rst
@@ -1,5 +1,5 @@
1Upgrading from 2.0.x to 2.1.y 1Upgrade from 2.0.x to 2.1.1
2============================= 2===========================
3 3
4.. warning:: 4.. warning::
5Before this migration, if you configured the Pocket import by adding your consumer key in Internal settings, please do a backup of it: you'll have to add it into the Config page after the upgrade. 5Before this migration, if you configured the Pocket import by adding your consumer key in Internal settings, please do a backup of it: you'll have to add it into the Config page after the upgrade.
@@ -7,8 +7,6 @@ Before this migration, if you configured the Pocket import by adding your consum
7Upgrade on a dedicated web server 7Upgrade on a dedicated web server
8--------------------------------- 8---------------------------------
9 9
10The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.1.1`` by the last release number):
11
12:: 10::
13 11
14 rm -rf var/cache/* 12 rm -rf var/cache/*
@@ -16,7 +14,6 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
16 git fetch --tags 14 git fetch --tags
17 git checkout 2.1.1 --force 15 git checkout 2.1.1 --force
18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 16 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
19 php bin/console doctrine:migrations:migrate --env=prod
20 php bin/console cache:clear --env=prod 17 php bin/console cache:clear --env=prod
21 18
22Upgrade on a shared hosting 19Upgrade on a shared hosting
@@ -28,25 +25,18 @@ Download the last release of wallabag:
28 25
29.. code-block:: bash 26.. code-block:: bash
30 27
31 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package 28 wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.0.8.tar.gz
32 29
33(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``) 30(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``)
34 31
35Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. 32Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
36 33
37Please note that we added new parameters in this version. You have to edit ``app/config/parameters.yml`` by adding these lines (replace with your configuration) : 34Please check that your ``app/config/parameters.yml`` contains all the required parameters. Here is a default ``parameters.yml`` file. If you don't know which parameter you need to set, please leave the default one.
35
36.. code-block:: yml
38 37
39.. code-block:: bash
40 38
41 # RabbitMQ processing
42 rabbitmq_host: localhost
43 rabbitmq_port: 5672
44 rabbitmq_user: guest
45 rabbitmq_password: guest
46 39
47 # Redis processing
48 redis_host: localhost
49 redis_port: 6379
50 40
51If you use SQLite, you must also copy your ``data/`` folder inside the new installation. 41If you use SQLite, you must also copy your ``data/`` folder inside the new installation.
52 42
diff --git a/docs/en/user/upgrade-2.0.x-2.0.y.rst b/docs/en/user/upgrade-2.1.x-2.1.y.rst
index 3391c2cd..575f4ba9 100644
--- a/docs/en/user/upgrade-2.0.x-2.0.y.rst
+++ b/docs/en/user/upgrade-2.1.x-2.1.y.rst
@@ -1,17 +1,17 @@
1Upgrade from 2.0.x to 2.0.y 1Upgrading from 2.1.x to 2.1.y
2=========================== 2=============================
3 3
4Upgrade on a dedicated web server 4Upgrade on a dedicated web server
5--------------------------------- 5---------------------------------
6 6
7The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.0.8`` by the last release number): 7The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.1.2`` by the last release number):
8 8
9:: 9::
10 10
11 rm -rf var/cache/* 11 rm -rf var/cache/*
12 git fetch origin 12 git fetch origin
13 git fetch --tags 13 git fetch --tags
14 git checkout 2.0.8 14 git checkout 2.1.2 --force
15 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 15 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
16 php bin/console cache:clear --env=prod 16 php bin/console cache:clear --env=prod
17 17
@@ -26,7 +26,7 @@ Download the last release of wallabag:
26 26
27 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package 27 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
28 28
29(md5 hash of the 2.0.8 package: ``4f84c725d1d6e3345eae0a406115e5ff``) 29(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``)
30 30
31Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. 31Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
32 32