From d5f5fd853ba4db0e181e173046c3b7851a00173c Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 29 Jun 2023 05:39:30 +0200 Subject: [PATCH] bundles/element-web: remove --openssl-legacy-provider --- bundles/element-web/items.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/bundles/element-web/items.py b/bundles/element-web/items.py index 0edf9c9..b141c97 100644 --- a/bundles/element-web/items.py +++ b/bundles/element-web/items.py @@ -8,7 +8,7 @@ directories = { git_deploy = { '/opt/element-web': { - 'rev': node.metadata['element-web']['version'], + 'rev': node.metadata.get('element-web/version'), 'repo': 'https://github.com/vector-im/element-web.git', 'triggers': { 'action:element-web_yarn', @@ -18,22 +18,16 @@ git_deploy = { files = { '/opt/element-web/webapp/config.json': { - 'content': metadata_to_json(node.metadata['element-web']['config']), + 'content': metadata_to_json(node.metadata.get('element-web/config')), 'needs': { 'action:element-web_yarn', }, }, } -extra_install_cmds = [] -if node.metadata.get('nodejs/version') >= 17: - # TODO verify this is still needed when upgrading to 1.12 - extra_install_cmds.append('export NODE_OPTIONS=--openssl-legacy-provider') - actions = { 'element-web_yarn': { 'command': ' && '.join([ - *extra_install_cmds, 'cd /opt/element-web', 'yarn install --pure-lockfile --ignore-scripts', 'yarn build',