diff options
Diffstat (limited to 'docs/en/user')
| -rw-r--r-- | docs/en/user/installation.rst | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 0920b976..e08e0306 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
| @@ -56,14 +56,13 @@ To install wallabag itself, you must run the following commands: | |||
| 56 | :: | 56 | :: |
| 57 | 57 | ||
| 58 | git clone https://github.com/wallabag/wallabag.git | 58 | git clone https://github.com/wallabag/wallabag.git |
| 59 | cd wallabag | 59 | cd wallabag && make install |
| 60 | ./install.sh | ||
| 61 | 60 | ||
| 62 | To start PHP's build-in server and test if everything did install correctly, you can do: | 61 | To start PHP's build-in server and test if everything did install correctly, you can do: |
| 63 | 62 | ||
| 64 | :: | 63 | :: |
| 65 | 64 | ||
| 66 | php bin/console server:run --env=prod | 65 | make run |
| 67 | 66 | ||
| 68 | And access wallabag at http://yourserverip:8000 | 67 | And access wallabag at http://yourserverip:8000 |
| 69 | 68 | ||
| @@ -240,12 +239,12 @@ Rights access to the folders of the project | |||
| 240 | Test environment | 239 | Test environment |
| 241 | ~~~~~~~~~~~~~~~~ | 240 | ~~~~~~~~~~~~~~~~ |
| 242 | 241 | ||
| 243 | When 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. | 242 | When we just want to test wallabag, we just run the command ``make run`` 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. |
| 244 | 243 | ||
| 245 | Production environment | 244 | Production environment |
| 246 | ~~~~~~~~~~~~~~~~~~~~~~ | 245 | ~~~~~~~~~~~~~~~~~~~~~~ |
| 247 | 246 | ||
| 248 | As 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. | 247 | As soon as we use Apache or Nginx to access to our wallabag instance, and not from the command ``make run`` 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. |
| 249 | 248 | ||
| 250 | To do so, the folder name, known as ``DocumentRoot`` (for apache) or ``root`` (for Nginx), has to be absolutely accessible by the Apache/Nginx user. Its name is generally ``www-data``, ``apache`` or ``nobody`` (depending on linux system used). | 249 | To do so, the folder name, known as ``DocumentRoot`` (for apache) or ``root`` (for Nginx), has to be absolutely accessible by the Apache/Nginx user. Its name is generally ``www-data``, ``apache`` or ``nobody`` (depending on linux system used). |
| 251 | 250 | ||