aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-05-03 15:50:13 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-05-03 15:50:13 +0200
commitbba9907d1ffe993da3bc9b7e6c87169953a11160 (patch)
tree07bdb64837956dd13f20fa0cf9f8cbaca1924cba /docs/en
parent97c8eb3c2398d0aaf06155de5e0828e4020cb5d4 (diff)
downloadwallabag-bba9907d1ffe993da3bc9b7e6c87169953a11160.tar.gz
wallabag-bba9907d1ffe993da3bc9b7e6c87169953a11160.tar.zst
wallabag-bba9907d1ffe993da3bc9b7e6c87169953a11160.zip
Update documentation
Diffstat (limited to 'docs/en')
-rw-r--r--docs/en/index.rst4
-rw-r--r--docs/en/user/installation.rst63
-rw-r--r--docs/en/user/upgrade.rst12
3 files changed, 60 insertions, 19 deletions
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 590c234a..cd0948c2 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -8,7 +8,7 @@ wallabag documentation
8**wallabag** is a read-it-later application: it saves a web page by 8**wallabag** is a read-it-later application: it saves a web page by
9keeping content only. Elements like navigation or ads are deleted. 9keeping content only. Elements like navigation or ads are deleted.
10 10
11.. note:: 11.. tip::
12 12
13 This documentation is about wallabag v2. If you want to read documentation for wallabag v1, `please have a look here <https://github.com/wallabag/documentation>`__. 13 This documentation is about wallabag v2. If you want to read documentation for wallabag v1, `please have a look here <https://github.com/wallabag/documentation>`__.
14 14
@@ -25,8 +25,8 @@ The main documentation for this application is organized into a couple sections:
25 25
26 user/faq 26 user/faq
27 user/installation 27 user/installation
28 user/migration
29 user/upgrade 28 user/upgrade
29 user/migration
30 user/create_account 30 user/create_account
31 user/login 31 user/login
32 user/configuration 32 user/configuration
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index c2174a53..3057373c 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -34,6 +34,9 @@ and it's corresponding database server.
34Installation 34Installation
35------------ 35------------
36 36
37On a dedicated web server (recommended way)
38~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
39
37wallabag uses a big number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you don't already have. 40wallabag uses a big number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you don't already have.
38 41
39Install Composer: 42Install Composer:
@@ -54,7 +57,7 @@ To install wallabag itself, you must run these two commands:
54 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 57 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
55 php bin/console wallabag:install --env=prod 58 php bin/console wallabag:install --env=prod
56 59
57To start php's build-in server and test if everything did install correctly, you can do: 60To start PHP's build-in server and test if everything did install correctly, you can do:
58 61
59:: 62::
60 63
@@ -62,14 +65,48 @@ To start php's build-in server and test if everything did install correctly, you
62 65
63And access wallabag at http://yourserverip:8000 66And access wallabag at http://yourserverip:8000
64 67
65.. note:: 68.. tip::
66 69
67 To define parameters with environment variables, you have to set these variables with ``SYMFONY__`` prefix. For example, ``SYMFONY__DATABASE_DRIVER``. You can have a look to the `Symfony documentation <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__. 70 To define parameters with environment variables, you have to set these variables with ``SYMFONY__`` prefix. For example, ``SYMFONY__DATABASE_DRIVER``. You can have a look to the `Symfony documentation <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__.
68 71
69Installing on Apache 72On a shared hosting
70-------------------- 73~~~~~~~~~~~~~~~~~~~
74
75We provide you a package with all dependancies inside.
76The default configuration uses SQLite for the database. If you want to change these settings, please edit ``app/config/parameters.yml``.
77
78We already created a user: login and password are ``wallabag``.
79
80.. caution:: With this package, wallabag don't check mandatory extensions used in the application (theses checks are made during ``composer install`` when you have a dedicated web server, see above).
81
82Execute this command to download and extract the latest package:
83
84.. code-block:: bash
85
86 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
87
88Now, read the following documentation to create your virtual host, then access to your wallabag.
89If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``.
90
91Installation with Docker
92------------------------
93
94We provide you a Docker image to install wallabag easily. Have a look to our repository on `Docker Hub <https://hub.docker.com/r/wallabag/wallabag/>`__ to have more information.
71 95
72Assuming you install wallabag in the /var/www/wallabag folder and that you want to use php as an Apache module, here's a vhost for wallabag: 96Command to launch container
97~~~~~~~~~~~~~~~~~~~~~~~~~~~
98
99.. code-block:: bash
100
101 docker pull wallabag/wallabag
102
103Virtual hosts
104-------------
105
106Configuration on Apache
107~~~~~~~~~~~~~~~~~~~~~~~
108
109Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you want to use PHP as an Apache module, here's a vhost for wallabag:
73 110
74:: 111::
75 112
@@ -111,10 +148,10 @@ Assuming you install wallabag in the /var/www/wallabag folder and that you want
111 148
112After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld. 149After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
113 150
114Installing on Nginx 151Configuration on Nginx
115------------------- 152~~~~~~~~~~~~~~~~~~~~~~
116 153
117Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe for wallabag : 154Assuming you install wallabag in the ``/var/www/wallabag`` folder, here's the recipe for wallabag :
118 155
119:: 156::
120 157
@@ -151,22 +188,19 @@ Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe
151 188
152After reloading or restarting nginx, you should now be able to access wallabag at http://domain.tld. 189After reloading or restarting nginx, you should now be able to access wallabag at http://domain.tld.
153 190
154.. note:: 191.. tip::
155 192
156 When you want to import large file into wallabag, you need to add this line in your nginx configuration ``client_max_body_size XM; # allows file uploads up to X megabytes``. 193 When you want to import large file into wallabag, you need to add this line in your nginx configuration ``client_max_body_size XM; # allows file uploads up to X megabytes``.
157 194
158
159Rights access to the folders of the project 195Rights access to the folders of the project
160------------------------------------------- 196-------------------------------------------
161 197
162 198Test environment
163Test Environment
164~~~~~~~~~~~~~~~~ 199~~~~~~~~~~~~~~~~
165 200
166When we just want to test wallabag, we just run the command ``php bin/console server:run --env=prod`` to start our wallabag instance and everything will go smoothly because the user who started the project can access to the current folder naturally, without any problem. 201When we just want to test wallabag, we just run the command ``php bin/console server:run --env=prod`` to start our wallabag instance and everything will go smoothly because the user who started the project can access to the current folder naturally, without any problem.
167 202
168 203Production environment
169Production Environment
170~~~~~~~~~~~~~~~~~~~~~~ 204~~~~~~~~~~~~~~~~~~~~~~
171 205
172As soon as we use Apache or Nginx to access to our wallabag instance, and not from the command ``php bin/console server:run --env=prod`` to start it, we should take care to grant the good rights on the good folders to keep safe all the folders of the project. 206As soon as we use Apache or Nginx to access to our wallabag instance, and not from the command ``php bin/console server:run --env=prod`` to start it, we should take care to grant the good rights on the good folders to keep safe all the folders of the project.
@@ -180,4 +214,3 @@ This is due to the fact that we will need to grant the same rights access on the
180.. code-block:: bash 214.. code-block:: bash
181 215
182 chown -R www-data:www-data /var/www/wallabag/var 216 chown -R www-data:www-data /var/www/wallabag/var
183
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst
index e4735631..7782dc8a 100644
--- a/docs/en/user/upgrade.rst
+++ b/docs/en/user/upgrade.rst
@@ -5,6 +5,7 @@ Upgrade 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.3`` 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.0.3`` by the last release number):
8
8:: 9::
9 10
10 git fetch origin 11 git fetch origin
@@ -12,12 +13,19 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
12 git checkout 2.0.3 13 git checkout 2.0.3
13 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist 14 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
14 php bin/console cache:clear --env=prod 15 php bin/console cache:clear --env=prod
15
16 16
17Upgrade on a shared hosting 17Upgrade on a shared hosting
18--------------------------- 18---------------------------
19 19
20Backup your ``app/config/parameters.yml`` file. Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. 20Backup your ``app/config/parameters.yml`` file.
21
22Download the last release of wallabag:
23
24.. code-block:: bash
25
26 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
27
28Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
21 29
22If you use SQLite, you must also copy your ``data/`` folder inside the new installation. 30If you use SQLite, you must also copy your ``data/`` folder inside the new installation.
23 31