From 32ff6d3e65cbdc70f7d0266fe299adfc78336e4f Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 23 Feb 2024 10:29:48 +0000 Subject: [PATCH] Update configuration --- composer.lock | 28 +++++++++---------- conf/cmi/editoria11y.settings.yml | 8 +++--- conf/cmi/purge.logger_channels.yml | 6 +++++ conf/cmi/purge.plugins.yml | 4 +++ conf/cmi/varnish_purger.settings.assets.yml | 30 +++++++++++++++++++++ 5 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 conf/cmi/varnish_purger.settings.assets.yml diff --git a/composer.lock b/composer.lock index cc5c6ea8..ef23d246 100644 --- a/composer.lock +++ b/composer.lock @@ -4142,16 +4142,16 @@ }, { "name": "drupal/helfi_proxy", - "version": "3.2.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "1ecaece7ca13117f3170b0fa5cf363e316b1dcf3" + "reference": "20dda60b28e43508d06fd08e4bfa705538f483bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/1ecaece7ca13117f3170b0fa5cf363e316b1dcf3", - "reference": "1ecaece7ca13117f3170b0fa5cf363e316b1dcf3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/20dda60b28e43508d06fd08e4bfa705538f483bf", + "reference": "20dda60b28e43508d06fd08e4bfa705538f483bf", "shasum": "" }, "require": { @@ -4187,10 +4187,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.2.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.2.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2024-01-08T07:35:45+00:00" + "time": "2024-02-23T10:27:26+00:00" }, { "name": "drupal/helfi_tpr", @@ -6441,24 +6441,24 @@ }, { "name": "drupal/twig_tweak", - "version": "3.2.1", + "version": "3.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/twig_tweak.git", - "reference": "3.2.1" + "reference": "3.3.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/twig_tweak-3.2.1.zip", - "reference": "3.2.1", - "shasum": "89fc08b60f494a7d786251b6c2c493c536218222" + "url": "https://ftp.drupal.org/files/projects/twig_tweak-3.3.0.zip", + "reference": "3.3.0", + "shasum": "a029ab1775b62f08e573e5ad1ab27bc833e7f5b9" }, "require": { "drupal/core": "^9.3 || ^10.0", "ext-json": "*", "php": ">=7.3", "symfony/polyfill-php80": "^1.17", - "twig/twig": "^2.12 || ^3.3.8" + "twig/twig": "^2.15.3 || ^3.4.3" }, "suggest": { "symfony/var-dumper": "Better dump() function for debugging Twig variables" @@ -6466,8 +6466,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.2.1", - "datestamp": "1677404306", + "version": "3.3.0", + "datestamp": "1708670116", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/editoria11y.settings.yml b/conf/cmi/editoria11y.settings.yml index 26bafa37..4491d62f 100644 --- a/conf/cmi/editoria11y.settings.yml +++ b/conf/cmi/editoria11y.settings.yml @@ -1,12 +1,12 @@ _core: default_config_hash: NGxFi-xycxrzrGVZtCUl7MACi0jVRk130tNabvIN6ng content_root: '' +assertiveness: smart no_load: '' -ignore_containers: '' embedded_content_warning: '' -allow_overflow: '' -assertiveness: smart download_links: '' ignore_link_strings: '' -hidden_handlers: '' link_ignore_selector: 'svg.ext, svg.mailto, .link-purpose-text' +hidden_handlers: '' +ignore_containers: '' +allow_overflow: '' diff --git a/conf/cmi/purge.logger_channels.yml b/conf/cmi/purge.logger_channels.yml index cc39a601..d2acba46 100644 --- a/conf/cmi/purge.logger_channels.yml +++ b/conf/cmi/purge.logger_channels.yml @@ -27,3 +27,9 @@ channels: - 0 - 2 - 3 + - + id: purger_varnish_assets + grants: + - 0 + - 2 + - 3 diff --git a/conf/cmi/purge.plugins.yml b/conf/cmi/purge.plugins.yml index bf7c8663..a7f8641f 100644 --- a/conf/cmi/purge.plugins.yml +++ b/conf/cmi/purge.plugins.yml @@ -7,6 +7,10 @@ purgers: instance_id: varnish_purge_all plugin_id: varnish order_index: 3 + - + instance_id: assets + plugin_id: varnish + order_index: 4 processors: - plugin_id: drush_purge_queue_work diff --git a/conf/cmi/varnish_purger.settings.assets.yml b/conf/cmi/varnish_purger.settings.assets.yml new file mode 100644 index 00000000..71357183 --- /dev/null +++ b/conf/cmi/varnish_purger.settings.assets.yml @@ -0,0 +1,30 @@ +uuid: b18f3489-d833-4896-9cb7-5b5827604a51 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: W2iqfgCjeJZBrD986D1BhZ_gCyDeusZz5ahWyiDDLsM +id: assets +name: Assets +invalidationtype: regex +hostname: localhost +port: 6081 +path: '/[invalidation:expression]' +request_method: BAN +scheme: http +verify: '1' +headers: + - + field: X-VC-Purge-Method + value: regex + - + field: Host + value: localhost +body: null +body_content_type: null +runtime_measurement: true +timeout: 1.0 +connect_timeout: 1.0 +cooldown_time: 0.0 +max_requests: 100 +http_errors: true