X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=487e934bcd0ab1262ff748fc4c9780636e17b503;hb=eb2d613c3ed95d741e987917f976da349ea240eb;hp=7107d4c6c151bdc264900f22138df0564dab0b6e;hpb=4ec9f5c334605d0f5c941bc081a2994e2f7e0e7d;p=github%2Fwallabag%2Fwallabag.git diff --git a/app/config/config.yml b/app/config/config.yml index 7107d4c6..487e934b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.1.3 + 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' @@ -78,7 +78,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 @@ -115,12 +115,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: @@ -129,10 +143,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: @@ -193,7 +218,9 @@ fos_oauth_server: auth_code_class: Wallabag\ApiBundle\Entity\AuthCode service: user_provider: fos_user.user_manager - + options: + refresh_token_lifetime: 1209600 + scheb_two_factor: trusted_computer: enabled: true @@ -211,16 +238,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: @@ -241,6 +258,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: @@ -291,6 +313,14 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.instapaper' callback: wallabag_import.consumer.amqp.instapaper + import_pinboard: + connection: default + exchange_options: + name: 'wallabag.import.pinboard' + type: topic + queue_options: + name: 'wallabag.import.pinboard' + callback: wallabag_import.consumer.amqp.pinboard import_wallabag_v1: connection: default exchange_options: @@ -323,3 +353,17 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.chrome' callback: wallabag_import.consumer.amqp.chrome + +fos_js_routing: + routes_to_expose: + - homepage + - starred + - archive + - all + - tag + - config + - import + - developer + - howto + - logout + - new