X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=591b5294aa08536e2cb6834a836bf6808703c81e;hb=68cb89a5161351dd730871fc834bf147204a2a07;hp=65187ecab0a587405df60ce57958257b89db7956;hpb=d1b075509dff22e191bcf912d7eef9fb7b1661cc;p=github%2Fwallabag%2Fwallabag.git
diff --git a/app/config/config.yml b/app/config/config.yml
index 65187eca..591b5294 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.1.5
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages:
en: 'English'
@@ -44,14 +44,17 @@ wallabag_core:
es: 'Español'
oc: 'Occitan'
it: 'Italiano'
+ pt: 'Português'
items_on_page: 12
theme: material
language: '%locale%'
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 first troubleshoot this issue and report it to us.
+ wallabag can't retrieve contents for this article. Please troubleshoot this issue.
wallabag_user:
registration_enabled: "%fosuser_registration%"
@@ -77,7 +80,7 @@ doctrine:
dbname: "%database_name%"
user: "%database_user%"
password: "%database_password%"
- charset: UTF8
+ charset: "%database_charset%"
path: "%database_path%"
unix_socket: "%database_socket%"
server_version: 5.6
@@ -114,12 +117,26 @@ swiftmailer:
fos_rest:
param_fetcher_listener: true
body_listener: true
- format_listener: true
view:
+ mime_types:
+ csv:
+ - 'text/csv'
+ - 'text/plain'
+ pdf:
+ - 'application/pdf'
+ epub:
+ - 'application/epub+zip'
+ mobi:
+ - 'application/x-mobipocket-ebook'
view_response_listener: 'force'
formats:
xml: true
- json : true
+ json: true
+ txt: true
+ csv: true
+ pdf: true
+ epub: true
+ mobi: true
templating_formats:
html: true
force_redirects:
@@ -128,10 +145,21 @@ fos_rest:
default_engine: twig
routing_loader:
default_format: json
+ 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 }
+ # 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 }
nelmio_api_doc:
sandbox:
enabled: false
+ cache:
+ enabled: true
name: wallabag API documentation
nelmio_cors:
@@ -184,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
@@ -191,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:
@@ -210,16 +241,6 @@ kphoen_rulerz:
executors:
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:
@@ -240,6 +261,11 @@ old_sound_rabbit_mq:
exchange_options:
name: 'wallabag.import.readability'
type: topic
+ import_pinboard:
+ connection: default
+ exchange_options:
+ name: 'wallabag.import.pinboard'
+ type: topic
import_instapaper:
connection: default
exchange_options:
@@ -274,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:
@@ -282,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:
@@ -290,6 +318,16 @@ 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:
+ name: 'wallabag.import.pinboard'
+ type: topic
+ 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:
@@ -298,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:
@@ -306,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:
@@ -314,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:
@@ -322,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