X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=0c2b6a1daf02dbc8f54129d87bc806c632089bd3;hb=80336f77fd6ef72dafe20b35b74d74d06592c06f;hp=d52f37c818f190aede838c00ce0dad98ffad07d4;hpb=15cc1838501955638f3ac6e0fb3235bb6ac4e26c;p=github%2Fwallabag%2Fwallabag.git diff --git a/app/config/config.yml b/app/config/config.yml index d52f37c8..0c2b6a1d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -2,6 +2,12 @@ imports: - { resource: parameters.yml } - { resource: security.yml } - { resource: services.yml } + - { resource: wallabag.yml } + +parameters: + # Allows to use the live reload feature for changes in assets + use_webpack_dev_server: false + craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter framework: #esi: ~ @@ -10,7 +16,7 @@ framework: fallback: "%locale%" secret: "%secret%" router: - resource: "%kernel.root_dir%/config/routing.yml" + resource: "%kernel.project_dir%/app/config/routing.yml" strict_requirements: ~ form: ~ csrf_protection: ~ @@ -20,49 +26,14 @@ framework: engines: ['twig'] default_locale: "%locale%" trusted_hosts: ~ - trusted_proxies: ~ session: # handler_id set to null will use default session handler from php.ini handler_id: session.handler.native_file - save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" + save_path: "%kernel.project_dir%/var/sessions/%kernel.environment%" fragments: ~ http_method_override: true assets: ~ -wallabag_core: - 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' - fr: 'Français' - de: 'Deutsch' - tr: 'Türkçe' - fa: 'فارسی' - ro: 'Română' - pl: 'Polish' - da: 'Dansk' - 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 troubleshoot this issue. - -wallabag_user: - registration_enabled: "%fosuser_registration%" - -wallabag_import: - allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv'] - resource_dir: "%kernel.root_dir%/../web/uploads/import" - # Twig Configuration twig: debug: "%kernel.debug%" @@ -75,6 +46,7 @@ twig: doctrine: dbal: driver: "%database_driver%" + driver_class: "%database_driver_class%" host: "%database_host%" port: "%database_port%" dbname: "%database_name%" @@ -100,7 +72,7 @@ stof_doctrine_extensions: sluggable: true doctrine_migrations: - dir_name: "%kernel.root_dir%/DoctrineMigrations" + dir_name: "%kernel.project_dir%/app/DoctrineMigrations" namespace: Application\Migrations table_name: migration_versions name: Application Migrations @@ -138,7 +110,7 @@ fos_rest: epub: true mobi: true templating_formats: - html: true + html: false force_redirects: html: true failed_validation: HTTP_BAD_REQUEST @@ -148,9 +120,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 } @@ -238,7 +210,7 @@ scheb_two_factor: mailer: wallabag_user.auth_code_mailer kphoen_rulerz: - executors: + targets: doctrine: true old_sound_rabbit_mq: @@ -300,6 +272,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: @@ -308,6 +281,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: @@ -316,6 +290,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: @@ -324,6 +299,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: @@ -332,6 +308,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: @@ -340,6 +317,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: @@ -348,6 +326,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: @@ -356,6 +335,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: @@ -370,3 +350,10 @@ fos_js_routing: - howto - fos_user_security_logout - new + +jms_serializer: + handlers: + # to be removed if we switch to (default) ISO8601 datetime instead of ATOM + # see: https://github.com/schmittjoh/JMSSerializerBundle/pull/494 + datetime: + default_format: "Y-m-d\\TH:i:sO" # ATOM