From: Nicolas Lœuillet Date: Wed, 28 Sep 2016 09:13:20 +0000 (+0200) Subject: Reordered upgrade documentation X-Git-Tag: 2.1.0~18^2~9 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=eef8aeec8fa56519363e90977900f198ff3bd19b Reordered upgrade documentation --- diff --git a/docs/de/index.rst b/docs/de/index.rst index d8cd8f39..62f8b54a 100644 --- a/docs/de/index.rst +++ b/docs/de/index.rst @@ -30,7 +30,8 @@ Die Dokumentation ist in anderen Sprachen verfügbar : user/faq user/installation - user/upgrade + user/upgrade-2.0.x-2.1.0 + user/upgrade-2.0.x-2.0.y user/migration user/import user/create_account diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade-2.0.x-2.0.y.rst similarity index 84% rename from docs/de/user/upgrade.rst rename to docs/de/user/upgrade-2.0.x-2.0.y.rst index 084dab74..c04b68f3 100644 --- a/docs/de/user/upgrade.rst +++ b/docs/de/user/upgrade-2.0.x-2.0.y.rst @@ -4,15 +4,14 @@ Wallabag updaten Update auf einem dedizierten Webserver -------------------------------------- -Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.1.0`` mit der neuesten Releasenummer): +Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.0.8`` mit der neuesten Releasenummer): :: git fetch origin git fetch --tags - git checkout 2.1.0 - ASSETS=build ./install.sh - php bin/console doctrine:migrations:migrate --env=prod + git checkout 2.0.8 + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod Update auf einem Shared Webhosting diff --git a/docs/de/user/upgrade-2.0.x-2.1.0.rst b/docs/de/user/upgrade-2.0.x-2.1.0.rst new file mode 100644 index 00000000..eb67e686 --- /dev/null +++ b/docs/de/user/upgrade-2.0.x-2.1.0.rst @@ -0,0 +1,50 @@ +Wallabag updaten +================ + +.. 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. + +Update auf einem dedizierten Webserver +-------------------------------------- + +Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.1.0`` mit der neuesten Releasenummer): + +:: + + git fetch origin + git fetch --tags + git checkout 2.1.0 + ASSETS=build ./install.sh + php bin/console doctrine:migrations:migrate --env=prod + php bin/console cache:clear --env=prod + +Update auf einem Shared Webhosting +---------------------------------- + +Sichere deine ``app/config/parameters.yml`` Datei. + +Lade das neueste Release von wallabag herunter: + +.. code-block:: bash + + wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package + +(md5 hash: ``4f84c725d1d6e3345eae0a406115e5ff``) + +Entpacke das Archiv in deinen wallabag Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei. + +Wenn du SQLite nutzt, musst auch das ``data/`` Verzeichnis in die neue Installation kopieren. + +Leere den ``var/cache`` Ordner. + +Sie müssen einige SQL-Abfragen ausführen, um Ihre Datenbank zu aktualisieren. We assume that the table prefix is ``wallabag_`` and the database server is a MySQL one: + +.. code-block:: sql + + ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL; + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry'); + ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL; + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import'); + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import'); + ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL; + DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key'; diff --git a/docs/en/index.rst b/docs/en/index.rst index 46450b8f..da23400b 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst @@ -30,7 +30,8 @@ The documentation is available in other languages: user/faq user/installation - user/upgrade + user/upgrade-2.0.x-2.1.0 + user/upgrade-2.0.x-2.0.y user/migration user/import user/create_account diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade-2.0.x-2.0.y.rst similarity index 74% rename from docs/en/user/upgrade.rst rename to docs/en/user/upgrade-2.0.x-2.0.y.rst index f547f247..6a0818b3 100644 --- a/docs/en/user/upgrade.rst +++ b/docs/en/user/upgrade-2.0.x-2.0.y.rst @@ -1,18 +1,17 @@ -Upgrade wallabag -================ +Upgrade from 2.0.x to 2.0.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.1.0`` 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.0.8`` by the last release number): :: git fetch origin git fetch --tags - git checkout 2.1.0 - ASSETS=build ./install.sh - php bin/console doctrine:migrations:migrate --env=prod + git checkout 2.0.8 + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod Upgrade on a shared hosting @@ -26,7 +25,7 @@ Download the last release of wallabag: wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(md5 hash of the package: ``4f84c725d1d6e3345eae0a406115e5ff``) +(md5 hash of the 2.0.8 package: ``4f84c725d1d6e3345eae0a406115e5ff``) Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. diff --git a/docs/en/user/upgrade-2.0.x-2.1.0.rst b/docs/en/user/upgrade-2.0.x-2.1.0.rst new file mode 100644 index 00000000..3a24ee58 --- /dev/null +++ b/docs/en/user/upgrade-2.0.x-2.1.0.rst @@ -0,0 +1,50 @@ +Upgrading from 2.0.x to 2.1.0 +============================= + +.. 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. + +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.0`` by the last release number): + +:: + + git fetch origin + git fetch --tags + git checkout 2.1.0 + ASSETS=build ./install.sh + php bin/console doctrine:migrations:migrate --env=prod + php bin/console cache:clear --env=prod + +Upgrade on a shared hosting +--------------------------- + +Backup your ``app/config/parameters.yml`` file. + +Download the last release of wallabag: + +.. code-block:: bash + + wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package + +(md5 hash of the package: ``4f84c725d1d6e3345eae0a406115e5ff``) + +Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. + +If you use SQLite, you must also copy your ``data/`` folder inside the new installation. + +Empty ``var/cache`` folder. + +You must run some SQL queries to upgrade your database. We assume that the table prefix is ``wallabag_`` and the database server is a MySQL one: + +.. code-block:: sql + + ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL; + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry'); + ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL; + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import'); + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import'); + ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL; + DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key'; diff --git a/docs/fr/index.rst b/docs/fr/index.rst index dfa55afe..ff99948c 100644 --- a/docs/fr/index.rst +++ b/docs/fr/index.rst @@ -31,7 +31,8 @@ La documentation est disponible dans d'autres langues : user/faq user/installation - user/upgrade + user/upgrade-2.0.x-2.1.0 + user/upgrade-2.0.x-2.0.y user/migration user/import user/create_account diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade-2.0.x-2.0.y.rst similarity index 77% rename from docs/fr/user/upgrade.rst rename to docs/fr/user/upgrade-2.0.x-2.0.y.rst index 42aef9c7..d8dfac6e 100644 --- a/docs/fr/user/upgrade.rst +++ b/docs/fr/user/upgrade-2.0.x-2.0.y.rst @@ -1,18 +1,17 @@ -Mettre à jour wallabag -====================== +Mettre à jour de la 2.0.x à la 2.0.y +==================================== Mise à jour sur un serveur dédié -------------------------------- -La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.1.0`` par le numéro de la dernière version) : +La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.0.8`` par le numéro de la dernière version) : :: git fetch origin git fetch --tags - git checkout 2.1.0 - ASSETS=build ./install.sh - php bin/console doctrine:migrations:migrate --env=prod + git checkout 2.0.8 + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console cache:clear --env=prod Mise à jour sur un hébergement mutualisé @@ -26,7 +25,7 @@ Téléchargez la dernière version de wallabag : wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(hash md5 de l'archive : ``4f84c725d1d6e3345eae0a406115e5ff``) +(hash md5 de l'archive 2.0.8 : ``4f84c725d1d6e3345eae0a406115e5ff``) Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. diff --git a/docs/fr/user/upgrade-2.0.x-2.1.0.rst b/docs/fr/user/upgrade-2.0.x-2.1.0.rst new file mode 100644 index 00000000..18f09a63 --- /dev/null +++ b/docs/fr/user/upgrade-2.0.x-2.1.0.rst @@ -0,0 +1,51 @@ +Mettre à jour de la 2.0.x à la 2.1.0 +==================================== + +.. warning:: +Avant cette migration, si vous aviez configuré l'import depuis Pocket en ajoutant votre consumer key dans les paramètres internes, pensez à effectuer une sauvegarde de celle-ci : vous devrez l'ajouter dans la configuration de wallabag après la mise à jour. + +Mise à jour sur un serveur dédié +-------------------------------- + +La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.1.0`` par le numéro de la dernière version) : + +:: + + git fetch origin + git fetch --tags + git checkout 2.1.0 + ASSETS=build ./install.sh + php bin/console doctrine:migrations:migrate --env=prod + php bin/console cache:clear --env=prod + +Mise à jour sur un hébergement mutualisé +---------------------------------------- + +Effectuez une sauvegarde du fichier ``app/config/parameters.yml``. + +Téléchargez la dernière version de wallabag : + +.. code-block:: bash + + wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package + +(hash md5 de l'archive : ``4f84c725d1d6e3345eae0a406115e5ff``) + +Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. + +Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``. + +Videz le répertoire ``var/cache``. + +Vous allez devoir également exécuter des requêtes SQL pour mettre à jour votre base de données. Nous partons du principe que le préfixe de vos tables est ``wallabag_`` et que le serveur SQL est un serveur MySQL : + +.. code-block:: sql + + ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL; + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry'); + ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL; + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import'); + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import'); + ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL; + DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key'; + diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 95cb31d1..b70ca64d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -45,7 +45,6 @@ footer: social: 'Social' powered_by: 'propulsé par' about: 'À propos' - page_title: 'Configuration' config: page_title: 'Configuration'