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

Automatic update
City-of-Helsinki · Jan 19, 2023 · e5d666e · e5d666e
2 parents 0eff35a + 098e344
commit e5d666e
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 52 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -47,6 +47,7 @@ module:
   hdbt_admin_tools: 0
   hdbt_component_library: 0
   hdbt_content: 0
+  health_check: 0
   helfi_address_search: 0
   helfi_announcements: 0
   helfi_announcements_tpr: 0

diff --git a/conf/cmi/elasticsearch_connector.cluster.elastic_kasko.yml b/conf/cmi/elasticsearch_connector.cluster.elastic_kasko.yml
@@ -7,13 +7,13 @@ name: 'Elastic Kasko'
 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: ''
diff --git a/docker/openshift/entrypoints/20-deploy.sh b/docker/openshift/entrypoints/20-deploy.sh
@@ -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.