X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=8bef8312d366d0fd903e8a86fc81f7937f48ee05;hb=refs%2Fpull%2F3885%2Fhead;hp=04d757c1f3b9cbf87f0db517e23ee69c5f790f0b;hpb=70265817aee257e7e635eda79ce3e037e3b4a242;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/config/config.yml b/app/config/config.yml
index 04d757c1..8bef8312 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -26,7 +26,6 @@ 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
@@ -148,18 +147,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\.']