diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-03-28 14:07:42 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-03-28 14:07:42 +0200 |
commit | 7d1d961267c129e2110ce9cc14c5a9d0a7d255cb (patch) | |
tree | d260d7b4ffc8466d7d410ec61bd896bdadd8456e /docs/en/user/installation.rst | |
parent | e1cc8fd79921fdff9999087ba896c88b14ffc0cd (diff) | |
parent | 6ae579e43f6a4ffe607a6361191366410d19f806 (diff) | |
download | wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.gz wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.zst wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.zip |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'docs/en/user/installation.rst')
-rw-r--r-- | docs/en/user/installation.rst | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 7d3bcf61..2c4b8749 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -4,7 +4,7 @@ Install wallabag | |||
4 | Requirements | 4 | Requirements |
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | wallabag is compatible with PHP >= 5.5, including PHP 7. | 7 | wallabag is compatible with **PHP >= 5.6**, including PHP 7. |
8 | 8 | ||
9 | .. note:: | 9 | .. note:: |
10 | 10 | ||
@@ -110,6 +110,12 @@ Virtual hosts | |||
110 | Configuration on Apache | 110 | Configuration on Apache |
111 | ~~~~~~~~~~~~~~~~~~~~~~~ | 111 | ~~~~~~~~~~~~~~~~~~~~~~~ |
112 | 112 | ||
113 | Do not forget to active the *rewrite* mod of Apache | ||
114 | |||
115 | .. code-block:: bash | ||
116 | |||
117 | a2enmod rewrite && systemctl reload apache2 | ||
118 | |||
113 | Assuming 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: | 119 | Assuming 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: |
114 | 120 | ||
115 | :: | 121 | :: |
@@ -149,6 +155,23 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w | |||
149 | ErrorLog /var/log/apache2/wallabag_error.log | 155 | ErrorLog /var/log/apache2/wallabag_error.log |
150 | CustomLog /var/log/apache2/wallabag_access.log combined | 156 | CustomLog /var/log/apache2/wallabag_access.log combined |
151 | </VirtualHost> | 157 | </VirtualHost> |
158 | |||
159 | |||
160 | .. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : | ||
161 | |||
162 | :: | ||
163 | |||
164 | AllowOverride None | ||
165 | Order Allow,Deny | ||
166 | Allow from All | ||
167 | |||
168 | |||
169 | by | ||
170 | |||
171 | :: | ||
172 | |||
173 | Require All granted | ||
174 | |||
152 | 175 | ||
153 | After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld. | 176 | After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld. |
154 | 177 | ||