X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=584b0da2f5c9d56d24f195bd20aeb5604fda818a;hb=c0e8e6037b8cc762c4f1041c1d4de04023f14070;hp=ff0f5a0b28fed4f11dd51838e0ad3c19af0942c6;hpb=9ab024b4f5388e2a41c50a8a2b79e4033788782a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/config/config.yml b/app/config/config.yml
index ff0f5a0b..584b0da2 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.1.3-dev
+    version: 2.2.3
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -51,6 +51,8 @@ wallabag_core:
     rss_limit: 50
     reading_speed: 1
     cache_lifetime: 10
+    action_mark_as_read: 1
+    list_mode: 1
     fetching_error_message: |
         wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
 
@@ -146,9 +148,9 @@ fos_rest:
     format_listener:
         enabled: true
         rules:
-            - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: false, prefer_extension: false }
-            - { path: "^/api", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false }
-            - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false }
+            - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: json, prefer_extension: false }
+            - { path: "^/api", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
+            - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
             # for an unknown reason, EACH REQUEST goes to FOS\RestBundle\EventListener\FormatListener
             # so we need to add custom rule for custom api export but also for all other routes of the application...
             - { path: '^/', priorities: ['text/html', '*/*'], fallback_format: html, prefer_extension: false }
@@ -210,6 +212,7 @@ fos_user:
     from_email:
         address:        "%from_email%"
         sender_name:    wallabag
+
 fos_oauth_server:
     db_driver:           orm
     client_class:        Wallabag\ApiBundle\Entity\Client
@@ -217,7 +220,9 @@ fos_oauth_server:
     refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
     auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
     service:
-        user_provider: fos_user.user_manager
+        user_provider: fos_user.user_provider.username_email
+        options:
+            refresh_token_lifetime: 1209600
 
 scheb_two_factor:
     trusted_computer:
@@ -233,19 +238,9 @@ scheb_two_factor:
         mailer: wallabag_user.auth_code_mailer
 
 kphoen_rulerz:
-    executors:
+    targets:
         doctrine: true
 
-lexik_maintenance:
-    authorized:
-        ips: ['127.0.0.1']
-    driver:
-        ttl: 3600
-        class: 'Lexik\Bundle\MaintenanceBundle\Drivers\DatabaseDriver'
-    response:
-        code: 503
-        status: "wallabag Service Temporarily Unavailable"
-
 old_sound_rabbit_mq:
     connections:
         default:
@@ -305,6 +300,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.pocket'
             callback: wallabag_import.consumer.amqp.pocket
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_readability:
             connection: default
             exchange_options:
@@ -313,6 +309,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.readability'
             callback: wallabag_import.consumer.amqp.readability
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_instapaper:
             connection: default
             exchange_options:
@@ -321,6 +318,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.instapaper'
             callback: wallabag_import.consumer.amqp.instapaper
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pinboard:
             connection: default
             exchange_options:
@@ -329,6 +327,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.pinboard'
             callback: wallabag_import.consumer.amqp.pinboard
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v1:
             connection: default
             exchange_options:
@@ -337,6 +336,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.wallabag_v1'
             callback: wallabag_import.consumer.amqp.wallabag_v1
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v2:
             connection: default
             exchange_options:
@@ -345,6 +345,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.wallabag_v2'
             callback: wallabag_import.consumer.amqp.wallabag_v2
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_firefox:
             connection: default
             exchange_options:
@@ -353,6 +354,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.firefox'
             callback: wallabag_import.consumer.amqp.firefox
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_chrome:
             connection: default
             exchange_options:
@@ -361,3 +363,18 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.chrome'
             callback: wallabag_import.consumer.amqp.chrome
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
+
+fos_js_routing:
+    routes_to_expose:
+        - homepage
+        - starred
+        - archive
+        - all
+        - tag
+        - config
+        - import
+        - developer
+        - howto
+        - fos_user_security_logout
+        - new