diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/de/user/installation.rst | 6 | ||||
-rw-r--r-- | docs/en/developer/paywall.rst | 15 | ||||
-rw-r--r-- | docs/en/user/installation.rst | 6 | ||||
-rw-r--r-- | docs/fr/user/installation.rst | 6 | ||||
-rw-r--r-- | docs/it/user/installation.rst | 6 |
5 files changed, 36 insertions, 3 deletions
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index cec62d18..0de6b6de 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst | |||
@@ -111,6 +111,12 @@ Virtualhosts | |||
111 | Konfiguration von Apache | 111 | Konfiguration von Apache |
112 | ~~~~~~~~~~~~~~~~~~~~~~~~ | 112 | ~~~~~~~~~~~~~~~~~~~~~~~~ |
113 | 113 | ||
114 | Vergiss nicht, die *rewrite* mod von Apache zu aktivieren. | ||
115 | |||
116 | .. code-block:: bash | ||
117 | |||
118 | a2enmod rewrite && systemctl reload apache2 | ||
119 | |||
114 | Angenommen du willst wallabag in das Verzeichnis ``/var/www/wallabag`` installieren und du willst PHP als Apache Modul nutzen, dann ist hier ein vhost für wallabag: | 120 | Angenommen du willst wallabag in das Verzeichnis ``/var/www/wallabag`` installieren und du willst PHP als Apache Modul nutzen, dann ist hier ein vhost für wallabag: |
115 | 121 | ||
116 | :: | 122 | :: |
diff --git a/docs/en/developer/paywall.rst b/docs/en/developer/paywall.rst index 365027b4..153afa6f 100644 --- a/docs/en/developer/paywall.rst +++ b/docs/en/developer/paywall.rst | |||
@@ -6,12 +6,16 @@ wallabag can fetch articles from websites which use a paywall system. | |||
6 | Enable paywall authentication | 6 | Enable paywall authentication |
7 | ----------------------------- | 7 | ----------------------------- |
8 | 8 | ||
9 | In internal settings, in the **Article** section, enable authentication for websites with paywall (with the value 1). | 9 | In internal settings, as a wallabag administrator, in the **Article** section, enable authentication for websites with paywall (with the value 1). |
10 | 10 | ||
11 | Configure credentials in wallabag | 11 | Configure credentials in wallabag |
12 | --------------------------------- | 12 | --------------------------------- |
13 | 13 | ||
14 | Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. Here is an example for some french websites: | 14 | Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. For example, under Ubuntu: |
15 | |||
16 | ``sudo -u www-data nano /var/www/html/wallabag/app/config/parameters.yml`` | ||
17 | |||
18 | Here is an example for some french websites (be careful: don't use the "tab" key, only spaces): | ||
15 | 19 | ||
16 | .. code:: yaml | 20 | .. code:: yaml |
17 | 21 | ||
@@ -28,7 +32,7 @@ Parsing configuration files | |||
28 | 32 | ||
29 | .. note:: | 33 | .. note:: |
30 | 34 | ||
31 | Read `this part of the documentation <http://doc.wallabag.org/en/master/user/errors_during_fetching.html>`_ to understand the configuration files. | 35 | Read `this part of the documentation <http://doc.wallabag.org/en/master/user/errors_during_fetching.html>`_ to understand the configuration files, which are located under ``vendor/j0k3r/graby-site-config/``. For most of the websites, this file is already configured: the following instructions are only for the websites that are not configured yet. |
32 | 36 | ||
33 | Each parsing configuration file needs to be improved by adding ``requires_login``, ``login_uri``, | 37 | Each parsing configuration file needs to be improved by adding ``requires_login``, ``login_uri``, |
34 | ``login_username_field``, ``login_password_field`` and ``not_logged_in_xpath``. | 38 | ``login_username_field``, ``login_password_field`` and ``not_logged_in_xpath``. |
@@ -54,3 +58,8 @@ For example: | |||
54 | login_password_field: password | 58 | login_password_field: password |
55 | 59 | ||
56 | not_logged_in_xpath: //body[@class="not-logged-in"] | 60 | not_logged_in_xpath: //body[@class="not-logged-in"] |
61 | |||
62 | Last step: clear the cache | ||
63 | -------------------------- | ||
64 | |||
65 | It's necessary to clear the wallabag cache with the following command (here under Ubuntu): ``sudo -u www-data php /var/www/html/wallabag/bin/console cache:clear -e=prod`` | ||
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 7fb81aeb..2b730b83 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -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 | :: |
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 319735af..5d29cb01 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst | |||
@@ -107,6 +107,12 @@ Virtual hosts | |||
107 | Configuration avec Apache | 107 | Configuration avec Apache |
108 | ~~~~~~~~~~~~~~~~~~~~~~~~~ | 108 | ~~~~~~~~~~~~~~~~~~~~~~~~~ |
109 | 109 | ||
110 | N'oubliez pas d'activer le mod *rewrite* de Apache | ||
111 | |||
112 | .. code-block:: bash | ||
113 | |||
114 | a2enmod rewrite && systemctl reload apache2 | ||
115 | |||
110 | En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wallabag`` et que vous utilisiez PHP comme un module Apache, voici un vhost pour wallabag : | 116 | En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wallabag`` et que vous utilisiez PHP comme un module Apache, voici un vhost pour wallabag : |
111 | 117 | ||
112 | :: | 118 | :: |
diff --git a/docs/it/user/installation.rst b/docs/it/user/installation.rst index cd6ebbef..a79a31d3 100644 --- a/docs/it/user/installation.rst +++ b/docs/it/user/installation.rst | |||
@@ -110,6 +110,12 @@ Host virtuali | |||
110 | Configurazione su Apache | 110 | Configurazione su Apache |
111 | ~~~~~~~~~~~~~~~~~~~~~~~~ | 111 | ~~~~~~~~~~~~~~~~~~~~~~~~ |
112 | 112 | ||
113 | Non dimenticate di attivare la mod *rewrite* di Apache | ||
114 | |||
115 | .. code-block:: bash | ||
116 | |||
117 | a2enmod rewrite && systemctl reload apache2 | ||
118 | |||
113 | Assumendo che voi abbiate installato wallabag nella cartella ``/var/www/wallabag`` e che vogliate usare PHP come un modulo Apache, ecco un vhost per l’applicazione: | 119 | Assumendo che voi abbiate installato wallabag nella cartella ``/var/www/wallabag`` e che vogliate usare PHP come un modulo Apache, ecco un vhost per l’applicazione: |
114 | 120 | ||
115 | :: | 121 | :: |