X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=bbcc682f989f9d7e5820f92f7152111e9c38c516;hb=0a258f85be31c5d99317ffdc83cc8735e504ed48;hp=2d8f9bf01eae24a7c1e7dd243f9e42179bd11e73;hpb=2e5b3fa361098498a9e42a65396a27e1eb487fba;p=github%2Fwallabag%2Fwallabag.git diff --git a/app/config/config.yml b/app/config/config.yml index 2d8f9bf0..bbcc682f 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -148,18 +148,18 @@ nelmio_cors: paths: '^/api/': allow_origin: ['*'] - allow_headers: ['X-Custom-Auth'] + allow_headers: ['Authorization','content-type'] allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE'] max_age: 3600 '^/oauth/': allow_origin: ['*'] - allow_headers: ['X-Custom-Auth'] + allow_headers: ['Authorization','content-type'] allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] max_age: 3600 '^/': #origin_regex: true - allow_origin: ['^http://localhost:[0-9]+'] - allow_headers: ['X-Custom-Auth'] + allow_origin: ['*'] + allow_headers: ['Authorization','content-type'] allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] max_age: 3600 hosts: ['^api\.'] @@ -370,3 +370,25 @@ jms_serializer: sensio_framework_extra: router: annotations: false + +httplug: + clients: + wallabag_core: + factory: 'wallabag_core.http_client_factory' + config: + defaults: + timeout: 10 + plugins: ['httplug.plugin.logger'] + wallabag_core.entry.download_images: + factory: 'httplug.factory.auto' + plugins: ['httplug.plugin.logger'] + wallabag_import.pocket.client: + factory: 'httplug.factory.auto' + plugins: + - 'httplug.plugin.logger' + - header_defaults: + headers: + 'content-type': 'application/json' + 'X-Accept': 'application/json' + discovery: + client: false