Merge pull request #570 from City-of-Helsinki/dev

Release 2023-01-26

Author: jeremysteerio

composer.lock

@@ -46,6 +46,7 @@ module:
   hdbt_admin_tools: 0
   hdbt_component_library: 0
   hdbt_content: 0
+  health_check: 0
   helfi_announcements: 0
   helfi_announcements_tpr: 0
   helfi_api_base: 0

conf/cmi/core.extension.yml

@@ -7,13 +7,13 @@ name: KYMP
 url: 'http://elastic:9200'
 options:
   multiple_nodes_connection: false
-  use_authentication: 1
+  use_authentication: true
   authentication_type: Basic
   username: ''
   password: ''
-  timeout: '3'
+  timeout: 3
   rewrite:
-    rewrite_index: 1
+    rewrite_index: true
     index:
       prefix: ''
       suffix: ''

conf/cmi/elasticsearch_connector.cluster.kymp.yml

@@ -35,7 +35,7 @@ field_mapper_config:
       value: '$.attributes[''short_title'']'
 storage_client_id: helfi_news
 storage_client_config: {  }
-persistent_cache_max_age: -1
+persistent_cache_max_age: 10800
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

conf/cmi/external_entities.external_entity_type.helfi_news.yml

@@ -18,7 +18,7 @@ field_mapper_config:
       value: '$.attributes["name"]'
 storage_client_id: helfi_news_groups
 storage_client_config: {  }
-persistent_cache_max_age: -1
+persistent_cache_max_age: 86400
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml

@@ -18,7 +18,7 @@ field_mapper_config:
       value: '$.attributes["name"]'
 storage_client_id: helfi_news_neighbourhoods
 storage_client_config: {  }
-persistent_cache_max_age: -1
+persistent_cache_max_age: 86400
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml

@@ -18,7 +18,7 @@ field_mapper_config:
       value: '$.attributes["name"]'
 storage_client_id: helfi_news_tags
 storage_client_config: {  }
-persistent_cache_max_age: -1
+persistent_cache_max_age: 86400
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: null

conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml

@@ -1 +1 @@
-label: Startsida
+label: Huvudsida

conf/cmi/language/sv/metatag.metatag_defaults.front.yml

@@ -51,7 +51,7 @@ services:
       - internal
   db:
     container_name: "${COMPOSE_PROJECT_NAME}-db"
-    image: druidfi/mariadb:10.7-drupal
+    image: druidfi/mariadb:10.9-drupal
     volumes:
       - db_data:/var/lib/mysql
     ports:

docker-compose.yml

@@ -13,6 +13,11 @@ if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then
   exit 1
 fi
 
+# Generate twig caches.
+if [ ! -d "/tmp/twig" ]; then
+  drush twig:compile || true
+fi
+
 # This script is run every time a container is spawned and certain environments might
 # start more than one Drupal container. This is used to make sure we run deploy
 # tasks only once per deploy.