diff --git a/composer.lock b/composer.lock index cd44b035..6e886a87 100644 --- a/composer.lock +++ b/composer.lock @@ -2933,17 +2933,17 @@ }, { "name": "drupal/easy_breadcrumb", - "version": "2.0.4", + "version": "2.0.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/easy_breadcrumb.git", - "reference": "2.0.4" + "reference": "2.0.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.4.zip", - "reference": "2.0.4", - "shasum": "dc0fc1d166a30028a3410f476467dcdea3d52223" + "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.5.zip", + "reference": "2.0.5", + "shasum": "e73a7c3568fccaf85b3df0ddd98d713f4d2f5415" }, "require": { "drupal/core": "^9.2 || ^10" @@ -2951,8 +2951,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.4", - "datestamp": "1668029764", + "version": "2.0.5", + "datestamp": "1673559799", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2986,6 +2986,10 @@ "name": "Neslee Canil Pinto", "homepage": "https://www.drupal.org/user/3580850" }, + { + "name": "NickDickinsonWilde", + "homepage": "https://www.drupal.org/user/3094661" + }, { "name": "RenatoG", "homepage": "https://www.drupal.org/user/3326031" @@ -4277,16 +4281,16 @@ }, { "name": "drupal/hdbt", - "version": "4.3.12", + "version": "4.3.14", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "5d5c5c0aab363feb930815dd932ba18c57cedb21" + "reference": "cd189d6854bebf066926258641eb9e62cbc30516" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5d5c5c0aab363feb930815dd932ba18c57cedb21", - "reference": "5d5c5c0aab363feb930815dd932ba18c57cedb21", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/cd189d6854bebf066926258641eb9e62cbc30516", + "reference": "cd189d6854bebf066926258641eb9e62cbc30516", "shasum": "" }, "require": { @@ -4301,23 +4305,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.12", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.14", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-01-12T10:33:44+00:00" + "time": "2023-01-16T11:58:48+00:00" }, { "name": "drupal/hdbt_admin", - "version": "1.8.4", + "version": "1.8.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "2f9581c2a7079c8eb2a05b6ef8987c105fcbc5f3" + "reference": "9e062a862d33d14dee10117a01b0c694cbc19d10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2f9581c2a7079c8eb2a05b6ef8987c105fcbc5f3", - "reference": "2f9581c2a7079c8eb2a05b6ef8987c105fcbc5f3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/9e062a862d33d14dee10117a01b0c694cbc19d10", + "reference": "9e062a862d33d14dee10117a01b0c694cbc19d10", "shasum": "" }, "require": { @@ -4333,10 +4337,60 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.8.4", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.8.5", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-11-30T09:55:26+00:00" + "time": "2023-01-17T09:33:26+00:00" + }, + { + "name": "drupal/health_check", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/health_check.git", + "reference": "3.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/health_check-3.0.0.zip", + "reference": "3.0.0", + "shasum": "7a08e19c97d788f46d6ff4448df96561908e92d5" + }, + "require": { + "drupal/core": "^9.4 || ^10", + "php": "^8.0" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "3.0.0", + "datestamp": "1671533283", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "back-2-95", + "homepage": "https://www.drupal.org/user/327328" + }, + { + "name": "bfr", + "homepage": "https://www.drupal.org/user/369262" + } + ], + "description": "Health check for load balancers", + "homepage": "https://www.drupal.org/project/health_check", + "support": { + "source": "https://git.drupalcode.org/project/health_check", + "issues": "https://www.drupal.org/project/issues/health_check" + } }, { "name": "drupal/helfi_ahjo", @@ -4373,21 +4427,22 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.3.7", + "version": "3.9.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "bbf138db7bac7701097881a36832288ae809bf7f" + "reference": "8b6c0ad0bce4a9d1c19203ae7e880b26f9845325" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/bbf138db7bac7701097881a36832288ae809bf7f", - "reference": "bbf138db7bac7701097881a36832288ae809bf7f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/8b6c0ad0bce4a9d1c19203ae7e880b26f9845325", + "reference": "8b6c0ad0bce4a9d1c19203ae7e880b26f9845325", "shasum": "" }, "require": { "drupal/entity": "^1.0", "drupal/filelog": "^2.1", + "drupal/health_check": "^3.0", "php": "^8.0", "t4web/composer-lock-parser": "^1.0" }, @@ -4405,10 +4460,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.7", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/3.9.10", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-12-21T10:10:38+00:00" + "time": "2023-01-18T12:10:48+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4539,16 +4594,16 @@ }, { "name": "drupal/helfi_media_map", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-media-map.git", - "reference": "183e0531d1b2590554c839684f3e283c3665b912" + "reference": "e0a1cebe10c881ad0c2c9d680c647560a85fe8a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-media-map/zipball/183e0531d1b2590554c839684f3e283c3665b912", - "reference": "183e0531d1b2590554c839684f3e283c3665b912", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-media-map/zipball/e0a1cebe10c881ad0c2c9d680c647560a85fe8a3", + "reference": "e0a1cebe10c881ad0c2c9d680c647560a85fe8a3", "shasum": "" }, "require": { @@ -4565,23 +4620,23 @@ ], "description": "Integrates hel.fi maps with Media", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-media-map/tree/1.0.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-media-map/tree/1.0.3", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-media-map/issues" }, - "time": "2021-11-18T05:55:15+00:00" + "time": "2023-01-16T10:54:33+00:00" }, { "name": "drupal/helfi_navigation", - "version": "1.0.9", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "c77baf3db4f5764452fbe0276edd106067fe7c0b" + "reference": "98e3a83bf68d002b1dfc7ca8aa6b06e33788833c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/c77baf3db4f5764452fbe0276edd106067fe7c0b", - "reference": "c77baf3db4f5764452fbe0276edd106067fe7c0b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/98e3a83bf68d002b1dfc7ca8aa6b06e33788833c", + "reference": "98e3a83bf68d002b1dfc7ca8aa6b06e33788833c", "shasum": "" }, "require": { @@ -4598,10 +4653,10 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.0.9", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.1.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2022-11-22T09:35:15+00:00" + "time": "2023-01-13T09:32:25+00:00" }, { "name": "drupal/helfi_platform_config", @@ -4732,16 +4787,16 @@ }, { "name": "drupal/helfi_proxy", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "72e2bcd5d0fcf4330f2c7ee8621a2a47a3ff1d9b" + "reference": "467379e347873021e9218e330732b29c51fdad1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/72e2bcd5d0fcf4330f2c7ee8621a2a47a3ff1d9b", - "reference": "72e2bcd5d0fcf4330f2c7ee8621a2a47a3ff1d9b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/467379e347873021e9218e330732b29c51fdad1a", + "reference": "467379e347873021e9218e330732b29c51fdad1a", "shasum": "" }, "require": { @@ -4766,10 +4821,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2023-01-11T07:39:14+00:00" + "time": "2023-01-16T09:45:08+00:00" }, { "name": "drupal/helfi_tpr", @@ -9985,16 +10040,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.2", + "version": "v4.15.3", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" + "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039", + "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039", "shasum": "" }, "require": { @@ -10035,9 +10090,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3" }, - "time": "2022-11-12T15:38:23+00:00" + "time": "2023-01-16T22:05:37+00:00" }, { "name": "nodespark/des-connector", diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 7fdcddb8..e5afe838 100644 --- 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 index 77f2f8ee..9aabd05e 100644 --- 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 index a37c0ae5..e7dc298d 100644 --- 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.