From 0065da0087d33b15a3454dc61911c490b28ac530 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:16:49 +0000 Subject: [PATCH] Update configuration --- .gitignore | 2 +- composer.lock | 200 ++++++++++++++++++++++++++++-- conf/cmi/core.extension.yml | 1 + docker/openshift/custom.locations | 9 -- 4 files changed, 190 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 318172ded..3ba13f708 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,8 @@ public/modules/contrib public/themes/contrib public/sites/default/files vendor -helfi-test-automation-python/ public/sites/simpletest/ +public/sites/backstop/ # Ignore the folder created by PhpStorm .idea/* diff --git a/composer.lock b/composer.lock index 8155cf553..d6f073669 100644 --- a/composer.lock +++ b/composer.lock @@ -3871,21 +3871,22 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.0", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "a4a0aaf97d34d0a04c6799be10b198558cce60aa" + "reference": "0c5927f9468396d85060dc87e650a08a07648173" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/a4a0aaf97d34d0a04c6799be10b198558cce60aa", - "reference": "a4a0aaf97d34d0a04c6799be10b198558cce60aa", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/0c5927f9468396d85060dc87e650a08a07648173", + "reference": "0c5927f9468396d85060dc87e650a08a07648173", "shasum": "" }, "require": { "drupal/entity": "^1.0", "drupal/health_check": "^3.0", + "drupal/monolog": "^3.0", "drupal/raven": "^4.0 || ^5.0", "ext-curl": "*", "firebase/php-jwt": "^6.5", @@ -3909,10 +3910,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.0", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.1", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-04-17T14:27:13+00:00" + "time": "2024-04-23T08:00:30+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4075,16 +4076,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.49", + "version": "4.3.50", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "d5382f4501486bd8e4b2c175ed5e2769f00df4e8" + "reference": "31270962a560539df2642cb8224fe57d4ed60fdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d5382f4501486bd8e4b2c175ed5e2769f00df4e8", - "reference": "d5382f4501486bd8e4b2c175ed5e2769f00df4e8", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/31270962a560539df2642cb8224fe57d4ed60fdc", + "reference": "31270962a560539df2642cb8224fe57d4ed60fdc", "shasum": "" }, "require": { @@ -4176,6 +4177,9 @@ "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" }, + "drupal/editoria11y": { + "[#3442729] Run drupalSettings.editoria11y.css_url through file_url_generator service": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/3a3b005271e7db4476198d822aba1e3ee2e0b8e6/patches/editoria11y-3442729.patch" + }, "drupal/eu_cookie_compliance": { "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/923b35f699820b544397a35b7696570e101cd02c/patches/eu_cookie_compliance_block_8.x-1.24.patch", "[#UHF-8720] Missing config schema for dependencies (https://www.drupal.org/i/3330024)": "https://www.drupal.org/files/issues/2022-12-28/config_dependencies_schema-3330024-2.patch" @@ -4201,10 +4205,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.49", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.50", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-04-19T11:57:05+00:00" + "time": "2024-04-23T08:12:58+00:00" }, { "name": "drupal/helfi_proxy", @@ -4960,6 +4964,77 @@ "docs": "https://www.drupal.org/docs/8/modules/metatag" } }, + { + "name": "drupal/monolog", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/monolog.git", + "reference": "3.0.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/monolog-3.0.2.zip", + "reference": "3.0.2", + "shasum": "a88e8249028e56a21c4472891381412b9733f768" + }, + "require": { + "drupal/core": "^10", + "monolog/monolog": "^3.2.0", + "php": "^8.1.0" + }, + "require-dev": { + "mglaman/phpstan-drupal": "^1.1", + "phpstan/extension-installer": "^1.3", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-deprecation-rules": "*", + "phpstan/phpstan-strict-rules": "^1.5", + "previousnext/coding-standard": "^1.0" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "3.0.2", + "datestamp": "1707845433", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "autoload": { + "psr-0": { + "Drupal\\Monolog": "src/" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0" + ], + "authors": [ + { + "name": "Luca Lusso", + "homepage": "https://www.drupal.org/user/266779", + "email": "lussoluca@gmail.com", + "role": "Project Lead" + }, + { + "name": "See contributors", + "homepage": "https://drupal.org/node/1937716/committers", + "role": "Developer" + }, + { + "name": "ParisLiakos", + "homepage": "https://www.drupal.org/user/1011436" + } + ], + "description": "A Framework for integrating with the Monolog library.", + "homepage": "https://drupal.org/project/monolog", + "support": { + "source": "https://git.drupalcode.org/project/monolog", + "issues": "https://drupal.org/project/issues/monolog" + } + }, { "name": "drupal/oembed_providers", "version": "2.1.2", @@ -8884,6 +8959,107 @@ }, "time": "2016-07-25T17:07:32+00:00" }, + { + "name": "monolog/monolog", + "version": "3.6.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654", + "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/log": "^2.0 || ^3.0" + }, + "provide": { + "psr/log-implementation": "3.0.0" + }, + "require-dev": { + "aws/aws-sdk-php": "^3.0", + "doctrine/couchdb": "~1.0@dev", + "elasticsearch/elasticsearch": "^7 || ^8", + "ext-json": "*", + "graylog2/gelf-php": "^1.4.2 || ^2.0", + "guzzlehttp/guzzle": "^7.4.5", + "guzzlehttp/psr7": "^2.2", + "mongodb/mongodb": "^1.8", + "php-amqplib/php-amqplib": "~2.4 || ^3", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-strict-rules": "^1.4", + "phpunit/phpunit": "^10.5.17", + "predis/predis": "^1.1 || ^2", + "ruflin/elastica": "^7", + "symfony/mailer": "^5.4 || ^6", + "symfony/mime": "^5.4 || ^6" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Monolog\\": "src/Monolog" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", + "homepage": "https://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging", + "psr-3" + ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/3.6.0" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2024-04-12T21:02:21+00:00" + }, { "name": "nikic/php-parser", "version": "v5.0.2", diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 9801cf011..9f42c8e73 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -112,6 +112,7 @@ module: metatag_twitter_cards: 0 metatag_views: 0 migrate: 0 + monolog: 0 mysql: 0 node: 0 oembed_providers: 0 diff --git a/docker/openshift/custom.locations b/docker/openshift/custom.locations index 58c9c69f1..ce6470cc1 100644 --- a/docker/openshift/custom.locations +++ b/docker/openshift/custom.locations @@ -1,12 +1,3 @@ -location ~ ^/(?:.*)-assets/(.*)$ { - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-Proto https; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://127.0.0.1:8080/$1$is_args$args; -} - location ~* \.(css|cur|js|jpe?g|gif|htc|ico|png|xml|otf|ttf|eot|woff|woff2|svg|mp4|svgz|ogg|ogv|pdf|pptx?|zip|tgz|gz|rar|bz2|doc|xls|exe|tar|mid|midi|wav|bmp|rtf|txt|map)$ { add_header Access-Control-Allow-Origin "*"; try_files $uri @rewrite;