Merge pull request #4026 from wallabag/3760-ignorelist-db

Move Ignore Origin rules to database

2 files changed, 9 insertions, 0 deletions

diff --git a/app/config/security.yml b/app/config/security.yml
index 760b2550..5a73440b 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -79,4 +79,5 @@ security:
         - { path: ^/annotations, roles: ROLE_USER }
         - { path: ^/2fa, role: IS_AUTHENTICATED_2FA_IN_PROGRESS }
         - { path: ^/users, roles: ROLE_SUPER_ADMIN }
+        - { path: ^/ignore-origin-instance-rules, roles: ROLE_SUPER_ADMIN }
         - { path: ^/, roles: ROLE_USER }
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index eaa92507..4dad9200 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -165,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%"