From de3500390fe3bb9a029ffd0004340a21a7af67c8 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 18 Jun 2024 12:38:41 +0000 Subject: [PATCH] Update configuration --- .platform/schema | 2 +- compose.yaml | 10 +- composer.lock | 275 +++++++++++++++--------------- docker/elastic-proxy/elastic.conf | 2 +- tools/make/Makefile | 2 - tools/make/include.mk | 3 - 6 files changed, 148 insertions(+), 146 deletions(-) diff --git a/.platform/schema b/.platform/schema index 62f94575..c7930257 100644 --- a/.platform/schema +++ b/.platform/schema @@ -1 +1 @@ -6 \ No newline at end of file +7 \ No newline at end of file diff --git a/compose.yaml b/compose.yaml index 0e16d19e..99f55b27 100644 --- a/compose.yaml +++ b/compose.yaml @@ -100,17 +100,17 @@ services: - internal labels: - "traefik.enable=true" - - "traefik.http.routers.nginx.entrypoints=https" - - "traefik.http.routers.nginx.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)" - - "traefik.http.services.nginx.loadbalancer.server.port=8080" - - "traefik.http.routers.nginx.tls=true" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.entrypoints=https" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.tls=true" + - "traefik.http.services.${COMPOSE_PROJECT_NAME}-elastic-proxy.loadbalancer.server.port=8080" - "traefik.docker.network=stonehenge-network" - "traefik.http.middlewares.cors-header.headers.accesscontrolallowmethods=GET,OPTIONS,POST" - "traefik.http.middlewares.cors-header.headers.accesscontrolallowheaders=*" - "traefik.http.middlewares.cors-header.headers.accesscontrolalloworiginlist=*" - "traefik.http.middlewares.cors-header.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.cors-header.headers.addvaryheader=true" - - "traefik.http.routers.nginx.middlewares=cors-header" + - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.middlewares=cors-header" depends_on: - elastic profiles: diff --git a/composer.lock b/composer.lock index 1d5220c0..e42e1048 100644 --- a/composer.lock +++ b/composer.lock @@ -1901,6 +1901,10 @@ "name": "alexpott", "homepage": "https://www.drupal.org/user/157725" }, + { + "name": "AstonVictor", + "homepage": "https://www.drupal.org/user/3466615" + }, { "name": "chr.fritsch", "homepage": "https://www.drupal.org/user/2103716" @@ -1934,16 +1938,16 @@ }, { "name": "drupal/core", - "version": "10.2.6", + "version": "10.2.7", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "cec9bc9e829e53e667da844edd5f4897be88d860" + "reference": "4416c8a86e5b57b5acc595e4855ce50fdb6a542d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/cec9bc9e829e53e667da844edd5f4897be88d860", - "reference": "cec9bc9e829e53e667da844edd5f4897be88d860", + "url": "https://api.github.com/repos/drupal/core/zipball/4416c8a86e5b57b5acc595e4855ce50fdb6a542d", + "reference": "4416c8a86e5b57b5acc595e4855ce50fdb6a542d", "shasum": "" }, "require": { @@ -2091,9 +2095,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.2.6" + "source": "https://github.com/drupal/core/tree/10.2.7" }, - "time": "2024-05-01T21:00:24+00:00" + "time": "2024-06-06T07:25:42+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -2375,20 +2379,20 @@ }, { "name": "drupal/diff", - "version": "1.4.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/diff.git", - "reference": "8.x-1.4" + "reference": "8.x-1.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "8f1e95e6c7f576999c5b2880023de2c2aaaf99b3" + "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.7.zip", + "reference": "8.x-1.7", + "shasum": "d282bdf3350ac71f95b38576a9f397bdbab8d249" }, "require": { - "drupal/core": "^9.3 || ^10 || ^11", + "drupal/core": "^10 || ^11", "mkalkbrenner/php-htmldiff-advanced": "~0.0.8", "php": "^8.1" }, @@ -2405,8 +2409,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1717130431", + "version": "8.x-1.7", + "datestamp": "1718073570", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3470,27 +3474,27 @@ }, { "name": "drupal/gin", - "version": "3.0.0-rc10", + "version": "3.0.0-rc11", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin.git", - "reference": "8.x-3.0-rc10" + "reference": "8.x-3.0-rc11" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc10.zip", - "reference": "8.x-3.0-rc10", - "shasum": "f79fd895dd1f16c3af457bfaed5527f5b5bc752c" + "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc11.zip", + "reference": "8.x-3.0-rc11", + "shasum": "532000cb8497412fb4b26efc362c7fc9efc44546" }, "require": { - "drupal/core": "^9 || ^10", + "drupal/core": "^9 || ^10 || ^11", "drupal/gin_toolbar": "^1.0@beta" }, "type": "drupal-theme", "extra": { "drupal": { - "version": "8.x-3.0-rc10", - "datestamp": "1712686345", + "version": "8.x-3.0-rc11", + "datestamp": "1718354743", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3532,26 +3536,26 @@ }, { "name": "drupal/gin_toolbar", - "version": "1.0.0-rc5", + "version": "1.0.0-rc6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin_toolbar.git", - "reference": "8.x-1.0-rc5" + "reference": "8.x-1.0-rc6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc5.zip", - "reference": "8.x-1.0-rc5", - "shasum": "523b565244440a16fa447065a98841770992bd2e" + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc6.zip", + "reference": "8.x-1.0-rc6", + "shasum": "542def14b9a5435efb4e021d384fa3f7b0fc6e78" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^9 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc5", - "datestamp": "1702727588", + "version": "8.x-1.0-rc6", + "datestamp": "1718368950", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3644,16 +3648,16 @@ }, { "name": "drupal/hdbt", - "version": "6.5.19", + "version": "6.5.24", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "14c0591acc5fba933ab83384905d88c3e3512c8a" + "reference": "0701bcbc9dca3a4c684060157c04fc6faa917d8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/14c0591acc5fba933ab83384905d88c3e3512c8a", - "reference": "14c0591acc5fba933ab83384905d88c3e3512c8a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/0701bcbc9dca3a4c684060157c04fc6faa917d8c", + "reference": "0701bcbc9dca3a4c684060157c04fc6faa917d8c", "shasum": "" }, "require": { @@ -3671,10 +3675,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.19", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.24", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-06-04T13:35:36+00:00" + "time": "2024-06-18T05:54:58+00:00" }, { "name": "drupal/hdbt_admin", @@ -3853,12 +3857,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "9b33c808570b6e8daea537fd96885f9fe7246274" + "reference": "cea692973b01424a3c3ffde13b9db48edbcbf6c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/9b33c808570b6e8daea537fd96885f9fe7246274", - "reference": "9b33c808570b6e8daea537fd96885f9fe7246274", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/cea692973b01424a3c3ffde13b9db48edbcbf6c9", + "reference": "cea692973b01424a3c3ffde13b9db48edbcbf6c9", "shasum": "" }, "require": { @@ -3930,7 +3934,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-05-21T06:26:52+00:00" + "time": "2024-06-12T09:40:19+00:00" }, { "name": "drupal/helfi_navigation", @@ -3968,16 +3972,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.61", + "version": "4.3.64", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "72db3a0c5d89bdbb29fc4d1a21173eace44ec225" + "reference": "b6246e6703ea4aa22cc635a29156fcbb5924b5fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/72db3a0c5d89bdbb29fc4d1a21173eace44ec225", - "reference": "72db3a0c5d89bdbb29fc4d1a21173eace44ec225", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b6246e6703ea4aa22cc635a29156fcbb5924b5fe", + "reference": "b6246e6703ea4aa22cc635a29156fcbb5924b5fe", "shasum": "" }, "require": { @@ -4080,6 +4084,9 @@ }, "drupal/view_unpublished": { "[#UHF-9256] Fix missing dynamic permission dependencies.": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/cbb944ae79643ba7ed895db3fac7f3b3d90ac850/patches/view_unpublished_permissions_missing_dependencies.patch" + }, + "drupal/elasticsearch_connector": { + "https://www.drupal.org/project/elasticsearch_connector/issues/3454977": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/959fd61553c8827b7350e53de4f66b2f6b8c97a1/patches/issue-3454977.patch" } } }, @@ -4088,10 +4095,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.61", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.64", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-06-05T13:08:07+00:00" + "time": "2024-06-18T12:35:32+00:00" }, { "name": "drupal/helfi_proxy", @@ -4189,16 +4196,16 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "3.0.6", + "version": "3.0.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "e968d82a3399dc98df148085e75c024e2cb85396" + "reference": "881201f804fd6350c8c4705a677619b25fd49c72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/e968d82a3399dc98df148085e75c024e2cb85396", - "reference": "e968d82a3399dc98df148085e75c024e2cb85396", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/881201f804fd6350c8c4705a677619b25fd49c72", + "reference": "881201f804fd6350c8c4705a677619b25fd49c72", "shasum": "" }, "require": { @@ -4215,10 +4222,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2024-04-30T10:07:43+00:00" + "time": "2024-06-18T07:56:54+00:00" }, { "name": "drupal/image_style_quality", @@ -5816,17 +5823,17 @@ }, { "name": "drupal/search_api", - "version": "1.34.0", + "version": "1.35.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.34" + "reference": "8.x-1.35" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.34.zip", - "reference": "8.x-1.34", - "shasum": "dd08166888f90adaf01cc1a759266097709efe7c" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.35.zip", + "reference": "8.x-1.35", + "shasum": "d119726e870f793c6470d2a4fa9286662c5eb45d" }, "require": { "drupal/core": "^10.1 || ^11" @@ -5847,8 +5854,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.34", - "datestamp": "1714899074", + "version": "8.x-1.35", + "datestamp": "1718551025", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6134,27 +6141,27 @@ }, { "name": "drupal/sophron", - "version": "2.0.2", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/sophron.git", - "reference": "2.0.2" + "reference": "2.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/sophron-2.0.2.zip", - "reference": "2.0.2", - "shasum": "ed5d910d6612ea591950b67384cc5ff26c5c7cc9" + "url": "https://ftp.drupal.org/files/projects/sophron-2.1.0.zip", + "reference": "2.1.0", + "shasum": "0742562897ae9b202e472a1edef75844b6452e39" }, "require": { - "drupal/core": "^10", - "fileeye/mimemap": "^2.0.1" + "drupal/core": "^10.2 || ^11", + "fileeye/mimemap": "^2.1.1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1699798487", + "version": "2.1.0", + "datestamp": "1718011690", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6710,20 +6717,20 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.2.6", + "version": "4.2.7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.2.6" + "reference": "4.2.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.6.zip", - "reference": "4.2.6", - "shasum": "20c6f77c0cebda75edfa570a8dc53fb133d6283a" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.7.zip", + "reference": "4.2.7", + "shasum": "25c9fa531ac49664a361fdd2202eec0a6e53bc61" }, "require": { - "drupal/core": "^9.4 || ^10", + "drupal/core": "^9.4 || ^10 || ^11", "php": ">=7.4.0" }, "require-dev": { @@ -6735,8 +6742,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.2.6", - "datestamp": "1704281842", + "version": "4.2.7", + "datestamp": "1717665214", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10025,16 +10032,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.3", + "version": "v0.12.4", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73" + "reference": "2fd717afa05341b4f8152547f142cd2f130f6818" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73", - "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818", + "reference": "2fd717afa05341b4f8152547f142cd2f130f6818", "shasum": "" }, "require": { @@ -10098,9 +10105,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.3" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.4" }, - "time": "2024-04-02T15:57:53+00:00" + "time": "2024-06-10T01:18:23+00:00" }, { "name": "ralouphie/getallheaders", @@ -10355,16 +10362,16 @@ }, { "name": "sentry/sentry", - "version": "4.7.0", + "version": "4.8.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f" + "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f", - "reference": "d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/3cf5778ff425a23f2d22ed41b423691d36f47163", + "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163", "shasum": "" }, "require": { @@ -10428,7 +10435,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.7.0" + "source": "https://github.com/getsentry/sentry-php/tree/4.8.0" }, "funding": [ { @@ -10440,7 +10447,7 @@ "type": "custom" } ], - "time": "2024-04-10T13:22:13+00:00" + "time": "2024-06-05T13:18:43+00:00" }, { "name": "stomp-php/stomp-php", @@ -13962,28 +13969,28 @@ }, { "name": "composer/ca-bundle", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "b66d11b7479109ab547f9405b97205640b17d385" + "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/b66d11b7479109ab547f9405b97205640b17d385", - "reference": "b66d11b7479109ab547f9405b97205640b17d385", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", + "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", "shasum": "" }, "require": { "ext-openssl": "*", "ext-pcre": "*", - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", + "phpstan/phpstan": "^1.10", "psr/log": "^1.0", "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { @@ -14018,7 +14025,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.4.0" + "source": "https://github.com/composer/ca-bundle/tree/1.5.0" }, "funding": [ { @@ -14034,20 +14041,20 @@ "type": "tidelift" } ], - "time": "2023-12-18T12:05:55+00:00" + "time": "2024-03-15T14:00:32+00:00" }, { "name": "composer/class-map-generator", - "version": "1.1.0", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9" + "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/953cc4ea32e0c31f2185549c7d216d7921f03da9", - "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", + "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", "shasum": "" }, "require": { @@ -14091,7 +14098,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.1.0" + "source": "https://github.com/composer/class-map-generator/tree/1.3.4" }, "funding": [ { @@ -14107,28 +14114,28 @@ "type": "tidelift" } ], - "time": "2023-06-30T13:58:57+00:00" + "time": "2024-06-12T14:13:04+00:00" }, { "name": "composer/composer", - "version": "2.7.1", + "version": "2.7.7", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc" + "reference": "291942978f39435cf904d33739f98d7d4eca7b23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", - "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", + "url": "https://api.github.com/repos/composer/composer/zipball/291942978f39435cf904d33739f98d7d4eca7b23", + "reference": "291942978f39435cf904d33739f98d7d4eca7b23", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", - "composer/class-map-generator": "^1.0", + "composer/class-map-generator": "^1.3.3", "composer/metadata-minifier": "^1.0", "composer/pcre": "^2.1 || ^3.1", - "composer/semver": "^3.2.5", + "composer/semver": "^3.3", "composer/spdx-licenses": "^1.5.7", "composer/xdebug-handler": "^2.0.2 || ^3.0.3", "justinrainbow/json-schema": "^5.2.11", @@ -14147,11 +14154,11 @@ "symfony/process": "^5.4 || ^6.0 || ^7" }, "require-dev": { - "phpstan/phpstan": "^1.9.3", - "phpstan/phpstan-deprecation-rules": "^1", - "phpstan/phpstan-phpunit": "^1.0", - "phpstan/phpstan-strict-rules": "^1", - "phpstan/phpstan-symfony": "^1.2.10", + "phpstan/phpstan": "^1.11.0", + "phpstan/phpstan-deprecation-rules": "^1.2.0", + "phpstan/phpstan-phpunit": "^1.4.0", + "phpstan/phpstan-strict-rules": "^1.6.0", + "phpstan/phpstan-symfony": "^1.4.0", "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" }, "suggest": { @@ -14205,7 +14212,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.7.1" + "source": "https://github.com/composer/composer/tree/2.7.7" }, "funding": [ { @@ -14221,7 +14228,7 @@ "type": "tidelift" } ], - "time": "2024-02-09T14:26:28+00:00" + "time": "2024-06-10T20:11:12+00:00" }, { "name": "composer/metadata-minifier", @@ -14294,16 +14301,16 @@ }, { "name": "composer/pcre", - "version": "3.1.1", + "version": "3.1.4", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + "reference": "04229f163664973f68f38f6f73d917799168ef24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", + "reference": "04229f163664973f68f38f6f73d917799168ef24", "shasum": "" }, "require": { @@ -14345,7 +14352,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.1" + "source": "https://github.com/composer/pcre/tree/3.1.4" }, "funding": [ { @@ -14361,7 +14368,7 @@ "type": "tidelift" } ], - "time": "2023-10-11T07:11:09+00:00" + "time": "2024-05-27T13:40:54+00:00" }, { "name": "composer/spdx-licenses", @@ -14445,16 +14452,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", "shasum": "" }, "require": { @@ -14465,7 +14472,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -14489,9 +14496,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" }, "funding": [ { @@ -14507,7 +14514,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-05-06T16:37:16+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -14938,12 +14945,12 @@ "version": "v5.2.13", "source": { "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", + "url": "https://github.com/jsonrainbow/json-schema.git", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, @@ -14998,8 +15005,8 @@ "schema" ], "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" + "issues": "https://github.com/jsonrainbow/json-schema/issues", + "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13" }, "time": "2023-09-26T02:20:38+00:00" }, diff --git a/docker/elastic-proxy/elastic.conf b/docker/elastic-proxy/elastic.conf index 89203d0c..3e77318e 100644 --- a/docker/elastic-proxy/elastic.conf +++ b/docker/elastic-proxy/elastic.conf @@ -8,7 +8,7 @@ server { return 200 '{"status":"success","result":"Proxy alive"}'; } - location ~ ^/([a-z][a-z_-]*)/(_search|_msearch)$ { + location ~ ^/([a-z][a-z_,-]*)/(_search|_msearch)$ { limit_except GET POST { deny all; } diff --git a/tools/make/Makefile b/tools/make/Makefile index 740dd607..fa000889 100644 --- a/tools/make/Makefile +++ b/tools/make/Makefile @@ -34,9 +34,7 @@ debug: ## Show debug information $(call dbg,COMPOSER_JSON_EXISTS,${COMPOSER_JSON_EXISTS}) $(call dbg,IS_DRUPAL,${IS_DRUPAL}) $(call dbg,IS_SYMFONY,${IS_SYMFONY}) - $(call dbg,IS_WP,${IS_WP}) $(call dbg,LAGOON,${LAGOON}) - $(call dbg,WODBY,${WODBY}) $(call dbg,SYSTEM,${SYSTEM}) $(call dbg,WEBROOT,${WEBROOT}) $(call dbg,UNAME_S,${UNAME_S}) diff --git a/tools/make/include.mk b/tools/make/include.mk index 3f469ae6..de30c41e 100644 --- a/tools/make/include.mk +++ b/tools/make/include.mk @@ -36,12 +36,9 @@ endif # LAGOON := $(shell test -f .lagoon.yml && echo yes || echo no) -WODBY := $(shell test -f wodby.yml && echo yes || echo no) ifeq ($(LAGOON),yes) SYSTEM := LAGOON -else ifeq ($(WODBY),yes) - SYSTEM := WODBY else SYSTEM := WHOKNOWS endif