From 7c1ce28342c85abb21dc79b9d22be35c0c09891b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 10 Oct 2016 11:21:20 +0200 Subject: [PATCH] Update upgrade documentation --- ....0.x-2.1.y.rst => upgrade-2.0.x-2.1.1.rst} | 22 +++++-------------- ....0.x-2.0.y.rst => upgrade-2.1.x-2.1.y.rst} | 10 ++++----- 2 files changed, 11 insertions(+), 21 deletions(-) rename docs/en/user/{upgrade-2.0.x-2.1.y.rst => upgrade-2.0.x-2.1.1.rst} (68%) rename docs/en/user/{upgrade-2.0.x-2.0.y.rst => upgrade-2.1.x-2.1.y.rst} (80%) 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 similarity index 68% rename from docs/en/user/upgrade-2.0.x-2.1.y.rst rename to 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 @@ -Upgrading from 2.0.x to 2.1.y -============================= +Upgrade from 2.0.x to 2.1.1 +=========================== .. warning:: Before 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 Upgrade on a dedicated web server --------------------------------- -The 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): - :: rm -rf var/cache/* @@ -16,7 +14,6 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba git fetch --tags git checkout 2.1.1 --force SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist - php bin/console doctrine:migrations:migrate --env=prod php bin/console cache:clear --env=prod Upgrade on a shared hosting @@ -28,25 +25,18 @@ Download the last release of wallabag: .. code-block:: bash - wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package + wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.0.8.tar.gz (md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``) Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. -Please 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) : +Please 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. + +.. code-block:: yml -.. code-block:: bash - # RabbitMQ processing - rabbitmq_host: localhost - rabbitmq_port: 5672 - rabbitmq_user: guest - rabbitmq_password: guest - # Redis processing - redis_host: localhost - redis_port: 6379 If you use SQLite, you must also copy your ``data/`` folder inside the new installation. 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 similarity index 80% rename from docs/en/user/upgrade-2.0.x-2.0.y.rst rename to 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 @@ -Upgrade from 2.0.x to 2.0.y -=========================== +Upgrading from 2.1.x to 2.1.y +============================= Upgrade on a dedicated web server --------------------------------- -The 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): +The 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): :: rm -rf var/cache/* git fetch origin git fetch --tags - git checkout 2.0.8 + git checkout 2.1.2 --force SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod @@ -26,7 +26,7 @@ Download the last release of wallabag: wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(md5 hash of the 2.0.8 package: ``4f84c725d1d6e3345eae0a406115e5ff``) +(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``) Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. -- 2.41.0