Upgrade Piwik Twig Extension to Matomo

[github/wallabag/wallabag.git] / app / config / wallabag.yml

diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index b45934e4b6f31bf71f470dee54e4a998240c8a48..f3da314c7399ba8905615d56f6fc8d1e9297d5aa 100644 (file)
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,10 +1,11 @@
 wallabag_core:
-    version: 2.2.3
+    version: 2.4.0-dev
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
+        th: 'ไทย'
         tr: 'Türkçe'
         fa: 'فارسی'
         ro: 'Română'
@@ -14,19 +15,22 @@ wallabag_core:
         oc: 'Occitan'
         it: 'Italiano'
         pt: 'Português'
+        ru: 'Русский'
+        ja: '日本語'
+        zh: '简体中文'
     items_on_page: 12
     theme: material
     language: '%locale%'
     rss_limit: 50
-    reading_speed: 1
+    reading_speed: 200
     cache_lifetime: 10
     action_mark_as_read: 1
     list_mode: 0
     fetching_error_message_title: 'No title found'
     fetching_error_message: |
-        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
+        wallabag can't retrieve contents for this article. Please <a href="https://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
     api_limit_mass_actions: 10
-    encryption_key_path: "%kernel.root_dir%/../data/site-credentials-secret-key.txt"
+    encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
     default_internal_settings:
         -
             name: share_public
@@ -42,7 +46,7 @@ wallabag_core:
             section: entry
         -
             name: diaspora_url
-            value: http://diasporapod.com
+            value: https://diasporapod.com
             section: entry
         -
             name: share_unmark
@@ -62,11 +66,11 @@ wallabag_core:
             section: entry
         -
             name: shaarli_url
-            value: http://myshaarli.com
+            value: https://myshaarli.com
             section: entry
         -
             name: scuttle_url
-            value: http://scuttle.org
+            value: https://scuttle.org
             section: entry
         -
             name: share_mail
@@ -121,15 +125,15 @@ wallabag_core:
             value: 0
             section: import
         -
-            name: piwik_enabled
+            name: matomo_enabled
             value: 0
             section: analytics
         -
-            name: piwik_host
-            value: v2.wallabag.org
+            name: matomo_host
+            value: matomo.wallabag.org
             section: analytics
         -
-            name: piwik_site_id
+            name: matomo_site_id
             value: 1
             section: analytics
         -
@@ -152,10 +156,26 @@ wallabag_core:
             name: api_user_registration
             value: 0
             section: api
+        -
+            name: store_article_headers
+            value: 0
+            section: entry
+        -
+            name: shaarli_share_origin_url
+            value: 0
+            section: entry
+
+    default_ignore_origin_instance_rules:
+        -
+            rule: host = "feedproxy.google.com"
+        -
+            rule: host = "feeds.reuters.com"
+        -
+            rule: _all ~ "https?://www\.lemonde\.fr/tiny.*"
 
 wallabag_user:
     registration_enabled: "%fosuser_registration%"
 
 wallabag_import:
     allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
-    resource_dir: "%kernel.root_dir%/../web/uploads/import"
+    resource_dir: "%kernel.project_dir%/web/uploads/import"