Skip to content

Commit

Permalink
Merge pull request #149 from City-of-Helsinki/update-configuration
Browse files Browse the repository at this point in the history
Automatic update
  • Loading branch information
jeremysteerio authored Jan 10, 2023
2 parents efbc47f + eb675f4 commit 571d5c8
Show file tree
Hide file tree
Showing 9 changed files with 571 additions and 119 deletions.
588 changes: 472 additions & 116 deletions composer.lock

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ module:
field_group: 0
field_ui: 0
file: 0
file_mdm: 0
filter: 0
flysystem: 0
flysystem_azure: 0
Expand Down Expand Up @@ -65,6 +66,7 @@ module:
image: 0
image_style_quality: 0
imagecache_external: 0
imagemagick: 0
language: 0
link: 0
linkit: 0
Expand Down Expand Up @@ -108,6 +110,7 @@ module:
select2_icon: 0
simple_sitemap: 0
social_media: 0
sophron: 0
system: 0
taxonomy: 0
telephone: 0
Expand Down
9 changes: 9 additions & 0 deletions conf/cmi/file_mdm.file_metadata_plugin.getimagesize.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
_core:
default_config_hash: o53U_2I-21Es-9iqxeUMDRcRxN0spL1OiHuAVQhh2oI
configuration:
cache:
override: false
settings:
enabled: true
expiration: 172800
disallowed_paths: { }
6 changes: 6 additions & 0 deletions conf/cmi/file_mdm.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
_core:
default_config_hash: Q8ZrmO8RU36KGMcNEaWFQOqYYO3z5Q4IZoS-xYy8MlA
metadata_cache:
enabled: true
expiration: 172800
disallowed_paths: { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
_core:
default_config_hash: o53U_2I-21Es-9iqxeUMDRcRxN0spL1OiHuAVQhh2oI
configuration:
cache:
override: false
settings:
enabled: true
expiration: 172800
disallowed_paths: { }
61 changes: 61 additions & 0 deletions conf/cmi/imagemagick.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
_core:
default_config_hash: do7QLcSY6lDV82NBI3jy5FNsUwWFjjJzXmHPTGsSvIQ
quality: 75
binaries: imagemagick
path_to_binaries: ''
prepend: ''
log_warnings: true
debug: false
locale: en_US.UTF-8
advanced:
density: 0
colorspace: '0'
profile: ''
coalesce: false
image_formats:
PNG:
mime_type: image/png
JPEG:
mime_type: image/jpeg
JPG:
mime_type: image/jpeg
weight: 10
enabled: false
GIF:
mime_type: image/gif
GIF87:
mime_type: image/gif
weight: 10
enabled: false
SVG:
mime_type: image/svg+xml
enabled: false
WEBP:
mime_type: image/webp
AVIF:
mime_type: image/avif
enabled: false
TIFF:
mime_type: image/tiff
enabled: false
PDF:
mime_type: application/pdf
enabled: false
HEIC:
mime_type: image/heif
enabled: false
BMP:
mime_type: image/x-ms-bmp
enabled: false
PSD:
mime_type: image/x-photoshop
enabled: false
WBMP:
mime_type: image/vnd.wap.wbmp
enabled: false
XBM:
mime_type: image/x-xbitmap
enabled: false
ICO:
mime_type: image/vnd.microsoft.icon
enabled: false
5 changes: 5 additions & 0 deletions conf/cmi/sophron.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
_core:
default_config_hash: kS--VUM7Yhfb5AIcnoXV8-JW90t-aIuQbzxPa1hbooU
map_option: 0
map_class: ''
map_commands: { }
2 changes: 1 addition & 1 deletion conf/cmi/system.image.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
_core:
default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24
toolkit: gd
toolkit: imagemagick
7 changes: 5 additions & 2 deletions public/sites/default/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,15 @@
$settings['matomo_site_id'] = getenv('MATOMO_SITE_ID');
$settings['siteimprove_id'] = getenv('SITEIMPROVE_ID');

$routes = [];
// Drupal route(s).
$routes = (getenv('DRUPAL_ROUTES')) ? explode(',', getenv('DRUPAL_ROUTES')) : [];
if ($drupal_routes = getenv('DRUPAL_ROUTES')) {
$routes = array_map(fn (string $route) => trim($route), explode(',', $drupal_routes));
}
$routes[] = 'http://127.0.0.1';

foreach ($routes as $route) {
$host = parse_url($route)['host'];
$host = parse_url($route, PHP_URL_HOST);
$trusted_host = str_replace('.', '\.', $host);
$settings['trusted_host_patterns'][] = '^' . $trusted_host . '$';
}
Expand Down

0 comments on commit 571d5c8

Please sign in to comment.