X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=2f102c45c6af9dadb068b470f9f5e31cb76c0919;hb=b28c5430efefa63d04d87404c99798e82d0427e4;hp=e18a932d13e5241b6ff2baa63066b62964edc632;hpb=b3437d58ae224121375c99e9288d8b808524e624;p=github%2Fwallabag%2Fwallabag.git diff --git a/app/config/config.yml b/app/config/config.yml index e18a932d..116bb04c 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -3,6 +3,10 @@ imports: - { resource: security.yml } - { resource: services.yml } +parameters: + # Allows to use the live reload feature for changes in assets + use_webpack_dev_server: false + framework: #esi: ~ translator: @@ -30,7 +34,7 @@ framework: assets: ~ wallabag_core: - version: 2.0.7 + version: 2.2.2 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' @@ -44,18 +48,24 @@ wallabag_core: es: 'Español' oc: 'Occitan' it: 'Italiano' + pt: 'Português' items_on_page: 12 theme: material - language: en + language: '%locale%' rss_limit: 50 reading_speed: 1 cache_lifetime: 10 + action_mark_as_read: 1 + list_mode: 0 + fetching_error_message: | + wallabag can't retrieve contents for this article. Please troubleshoot this issue. + api_limit_mass_actions: 10 wallabag_user: registration_enabled: "%fosuser_registration%" wallabag_import: - allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] + allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv'] resource_dir: "%kernel.root_dir%/../web/uploads/import" # Twig Configuration @@ -64,6 +74,7 @@ twig: strict_variables: "%kernel.debug%" form_themes: - "LexikFormFilterBundle:Form:form_div_layout.html.twig" + exception_controller: wallabag_core.exception_controller:showAction # Doctrine Configuration doctrine: @@ -74,8 +85,9 @@ 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 orm: @@ -110,12 +122,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: @@ -124,10 +150,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: 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 } nelmio_api_doc: sandbox: enabled: false + cache: + enabled: true name: wallabag API documentation nelmio_cors: @@ -180,6 +217,7 @@ fos_user: from_email: address: "%from_email%" sender_name: wallabag + fos_oauth_server: db_driver: orm client_class: Wallabag\ApiBundle\Entity\Client @@ -187,7 +225,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: @@ -203,19 +243,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: @@ -236,6 +266,16 @@ 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: + name: 'wallabag.import.instapaper' + type: topic import_wallabag_v1: connection: default exchange_options: @@ -246,6 +286,16 @@ old_sound_rabbit_mq: exchange_options: name: 'wallabag.import.wallabag_v2' type: topic + import_firefox: + connection: default + exchange_options: + name: 'wallabag.import.firefox' + type: topic + import_chrome: + connection: default + exchange_options: + name: 'wallabag.import.chrome' + type: topic consumers: import_pocket: connection: default @@ -254,7 +304,8 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.pocket' - callback: wallabag_import.consumer.ampq.pocket + callback: wallabag_import.consumer.amqp.pocket + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_readability: connection: default exchange_options: @@ -262,7 +313,26 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.readability' - callback: wallabag_import.consumer.ampq.readability + callback: wallabag_import.consumer.amqp.readability + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} + import_instapaper: + connection: default + exchange_options: + name: 'wallabag.import.instapaper' + type: topic + 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: @@ -270,7 +340,8 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.wallabag_v1' - callback: wallabag_import.consumer.ampq.wallabag_v1 + callback: wallabag_import.consumer.amqp.wallabag_v1 + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_wallabag_v2: connection: default exchange_options: @@ -278,4 +349,37 @@ old_sound_rabbit_mq: type: topic queue_options: name: 'wallabag.import.wallabag_v2' - callback: wallabag_import.consumer.ampq.wallabag_v2 + callback: wallabag_import.consumer.amqp.wallabag_v2 + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} + import_firefox: + connection: default + exchange_options: + name: 'wallabag.import.firefox' + type: topic + 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: + name: 'wallabag.import.chrome' + type: topic + 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