X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=77cda052b8f37bc44e749b0f2852aa43eaf060c3;hb=ac1509a66b510648ba6dd378c3d487802cf652b9;hp=3cde2377fc0e03a786d41b9ff92025b84d5322bc;hpb=49c5d0ad6ef5ceafdc0bec4533afcd27a01bd75f;p=github%2Fwallabag%2Fwallabag.git
diff --git a/app/config/config.yml b/app/config/config.yml
index 3cde2377..77cda052 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,8 +51,10 @@ 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 troubleshoot this issue.
+ wallabag can't retrieve contents for this article. Please troubleshoot this issue.
wallabag_user:
registration_enabled: "%fosuser_registration%"
@@ -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,7 +238,7 @@ scheb_two_factor:
mailer: wallabag_user.auth_code_mailer
kphoen_rulerz:
- executors:
+ targets:
doctrine: true
old_sound_rabbit_mq:
@@ -295,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:
@@ -303,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:
@@ -311,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:
@@ -319,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:
@@ -327,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:
@@ -335,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:
@@ -343,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:
@@ -351,6 +363,7 @@ 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:
@@ -363,5 +376,5 @@ fos_js_routing:
- import
- developer
- howto
- - about
- - logout
+ - fos_user_security_logout
+ - new