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 347d766d2a14664e2cee4f43ee7bab815599a14a..f3da314c7399ba8905615d56f6fc8d1e9297d5aa 100644 (file)
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -16,6 +16,8 @@ wallabag_core:
         it: 'Italiano'
         pt: 'Português'
         ru: 'Русский'
+        ja: '日本語'
+        zh: '简体中文'
     items_on_page: 12
     theme: material
     language: '%locale%'
@@ -44,7 +46,7 @@ wallabag_core:
             section: entry
         -
             name: diaspora_url
-            value: https://diasporapod.com/
+            value: https://diasporapod.com
             section: entry
         -
             name: share_unmark
@@ -67,8 +69,8 @@ wallabag_core:
             value: https://myshaarli.com
             section: entry
         -
-            name: https://scuttle.org
-            value: https://github.com/scronide/scuttle
+            name: scuttle_url
+            value: https://scuttle.org
             section: entry
         -
             name: share_mail
@@ -123,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
         -
@@ -163,6 +165,14 @@ wallabag_core:
             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%"