Merge pull request #339 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Nov 7, 2023 · 43c996c · 43c996c
2 parents d24f1b6 + 544ce47
commit 43c996c
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 62 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml
@@ -14,7 +14,7 @@ dependencies:
     - media_library
     - text
 _core:
-  default_config_hash: DuVlqWDqCioL_uKoV5oTbHouDQZWChekxk7VhucegKM
+  default_config_hash: AMDZDzWNP90sUgt9bSZf2RbL7KmSxkXMKIiueo1JSWg
 id: paragraph.remote_video.default
 targetEntityType: paragraph
 bundle: remote_video

diff --git a/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml
@@ -13,7 +13,7 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: MOnn4AFhzDjCTeqfjs5VvI3wK128ulmu_tPpo2VZ7YA
+  default_config_hash: hYT61xkhP2zXO2VXijtXVPkoENlhLvIv5DRycKMm6iE
 id: paragraph.remote_video.default
 targetEntityType: paragraph
 bundle: remote_video

diff --git a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml
@@ -5,12 +5,14 @@ dependencies:
   config:
     - field.storage.paragraph.field_iframe_title
     - paragraphs.paragraphs_type.remote_video
+_core:
+  default_config_hash: 4JZoeG_XitvgE9Tg7ZfVUwjpWcjeqktlO2tOnx_WfWU
 id: paragraph.remote_video.field_iframe_title
 field_name: field_iframe_title
 entity_type: paragraph
 bundle: remote_video
 label: 'Assistive technology title'
-description: 'Users of assistive technology need a descriptive title to know what is in the embedded content.'
+description: 'Users of assistive technology need a descriptive title to know what is in the embedded content. Do not use the prefix "Video: ". It will be added automatically.'
 required: true
 translatable: true
 default_value: {  }

diff --git a/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/language/fi/field.field.paragraph.remote_video.field_iframe_title.yml
@@ -1,2 +1,2 @@
 label: 'Avustavan teknologian otsikko'
-description: 'Avustavan teknologian käyttäjät tarvitsevat kuvaavan otsikon upotetulle sisällölle.'
+description: 'Avustavan teknologian käyttäjät tarvitsevat kuvaavan otsikon upotetulle sisällölle. Älä käytä etuliitettä "Video: ". Se lisätään automaattisesti.'
diff --git a/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/language/sv/field.field.paragraph.remote_video.field_iframe_title.yml
@@ -1,2 +1,2 @@
 label: 'Hjälpmedel rubrik'
-description: 'Användare av hjälpmedel behöver en beskrivande rubrik för inbäddad innehåll.'
+description: 'Användare av hjälpmedel behöver en beskrivande rubrik för inbäddad innehåll. Använd inte prefixet "Video: ". Den läggs till automatiskt.'
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -121,7 +121,7 @@ function drupal_get_env(string|array $variables) : mixed {
   }
   $settings['reverse_proxy'] = TRUE;
   $settings['reverse_proxy_addresses'] = $reverse_proxy_address;
-  $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_ALL;
+  $settings['reverse_proxy_trusted_headers'] = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO;
   $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST';
 }