Version bump za etherpad, services fix za cors

pull/26/head
Jurij Podgoršek 2024-01-06 18:55:09 +01:00
parent d7d5e85ae2
commit ca623adf86
3 changed files with 10 additions and 5 deletions

View File

@ -208,18 +208,19 @@ parameters:
cors.config: cors.config:
enabled: true enabled: true
# Specify allowed headers, like 'x-allowed-header'. # Specify allowed headers, like 'x-allowed-header'.
allowedHeaders: ['x-csrf-token','authorization','content-type','accept','origin','x-requested-with'] allowedHeaders: ['x-csrf-token','authorization','content-type','accept','origin','x-requested-with','access-control-allow-origin','x-allowed-header','*']
# Specify allowed request methods, specify ['*'] to allow all possible ones. # Specify allowed request methods, specify ['*'] to allow all possible ones.
allowedMethods: ['*'] allowedMethods: ['*']
# Configure requests allowed from specific origins. Do not include trailing # Configure requests allowed from specific origins. Do not include trailing
# slashes with URLs. # slashes with URLs.
allowedOrigins: ['*'] allowedOrigins: ['yufu.kompot.si']
# Sets the Access-Control-Expose-Headers header. # Sets the Access-Control-Expose-Headers header.
exposedHeaders: false exposedHeaders: false
# Sets the Access-Control-Max-Age header. # Sets the Access-Control-Max-Age header.
maxAge: false maxAge: false
# Sets the Access-Control-Allow-Credentials header. # Sets the Access-Control-Allow-Credentials header.
supportsCredentials: false supportsCredentials: true
allowCredentials: true
queue.config: queue.config:
# The maximum number of seconds to wait if a queue is temporarily suspended. # The maximum number of seconds to wait if a queue is temporarily suspended.

View File

@ -0,0 +1,6 @@
parameters:
cors.config:
enabled: true
allowedHeaders: ['x-csrf-token','authorization','content-type','accept','origin','x-requested-with','access-control-allow-origin','x-allowed-header','*']
allowedOrigins: ['*']
allowCredentials: true

View File

@ -777,5 +777,3 @@ if (file_exists(__DIR__ . '/settings.ddev.php') && getenv('IS_DDEV_PROJECT') ==
if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
include $app_root . '/' . $site_path . '/settings.local.php'; include $app_root . '/' . $site_path . '/settings.local.php';
} }
include $app_root."/sites/settings.local.php";