From 25d6a7e81122330b826aeb6602dfe73ab98d384a Mon Sep 17 00:00:00 2001 From: julian-marco Date: Wed, 15 Nov 2023 11:54:56 +0100 Subject: [PATCH 1/3] some config improvements --- dev.env | 1 + edc/edc.env | 4 +--- edc/resources/configs/config.properties | 9 +++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev.env b/dev.env index b20a2920..c650bfe9 100644 --- a/dev.env +++ b/dev.env @@ -51,6 +51,7 @@ EDC_VAULT="/resources/vaults/vault.properties" EDC_KEYSTORE="/resources/certs/sample_cert.pfx" EDC_KEYSTORE_PASSWORD="123456" EDC_SELF_DESCRIPTION_DOCUMENT_PATH="/resources/self-descriptions/self-description.json" +EDC_API_AUTH_KEY="password" EDC_DB_USER="postgres" EDC_DB_PASSWORD="v8a9B15GQhIs" diff --git a/edc/edc.env b/edc/edc.env index 60990f70..f7f0a31d 100644 --- a/edc/edc.env +++ b/edc/edc.env @@ -1,11 +1,9 @@ -AWS_ACCESS_KEY_ID=${S3_ROOT_USER:?error} -AWS_SECRET_ACCESS_KEY=${S3_ROOT_PASSWORD:?error} - EDC_FS_CONFIG=${EDC_FS_CONFIG:?error} EDC_VAULT=${EDC_VAULT:?error} EDC_KEYSTORE=${EDC_KEYSTORE:?error} EDC_KEYSTORE_PASSWORD=${EDC_KEYSTORE_PASSWORD:?error} EDC_SELF_DESCRIPTION_DOCUMENT_PATH=${EDC_SELF_DESCRIPTION_DOCUMENT_PATH:?error} +EDC_API_AUTH_KEY=${EDC_API_AUTH_KEY} HOST_IP_ADDRESS=${HOST_IP_ADDRESS:?error} diff --git a/edc/resources/configs/config.properties b/edc/resources/configs/config.properties index 8b86266a..ef7c6725 100644 --- a/edc/resources/configs/config.properties +++ b/edc/resources/configs/config.properties @@ -13,17 +13,18 @@ web.http.identity.path=/identity edc.dataplane.token.validation.endpoint=http://${HOST_IP_ADDRESS}:8183/control/token edc.ids.id=urn:connector:provider -edc.api.auth.key=password +edc.api.auth.key=${EDC_API_AUTH_KEY} edc.participant.id=provider +edc.hostname=${HOST_IP_ADDRESS} + edc.dsp.callback.address=http://${HOST_IP_ADDRESS}:8282/protocol -edc.aws.endpoint.override=http://${HOST_IP_ADDRESS}:9000 edc.jsonld.http.enabled=true edc.jsonld.https.enabled=true -edc.catalog.cache.execution.delay.seconds=5 -edc.catalog.cache.execution.period.seconds=5 +edc.catalog.cache.execution.delay.seconds=10 +edc.catalog.cache.execution.period.seconds=10 edc.catalog.cache.partition.num.crawlers=1 edc.datasource.asset.name=asset From 7086f6e4fae0706d7ab94764a34a1bb4d23a2498 Mon Sep 17 00:00:00 2001 From: julian-marco Date: Wed, 15 Nov 2023 12:07:35 +0100 Subject: [PATCH 2/3] more improvements --- dev.env | 1 + edc/edc.env | 2 ++ edc/resources/configs/config.properties | 8 +++----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dev.env b/dev.env index c650bfe9..1a12fcb9 100644 --- a/dev.env +++ b/dev.env @@ -52,6 +52,7 @@ EDC_KEYSTORE="/resources/certs/sample_cert.pfx" EDC_KEYSTORE_PASSWORD="123456" EDC_SELF_DESCRIPTION_DOCUMENT_PATH="/resources/self-descriptions/self-description.json" EDC_API_AUTH_KEY="password" +EDC_PARTICIPANT_ID="provider" EDC_DB_USER="postgres" EDC_DB_PASSWORD="v8a9B15GQhIs" diff --git a/edc/edc.env b/edc/edc.env index f7f0a31d..3eee2d4d 100644 --- a/edc/edc.env +++ b/edc/edc.env @@ -4,6 +4,8 @@ EDC_KEYSTORE=${EDC_KEYSTORE:?error} EDC_KEYSTORE_PASSWORD=${EDC_KEYSTORE_PASSWORD:?error} EDC_SELF_DESCRIPTION_DOCUMENT_PATH=${EDC_SELF_DESCRIPTION_DOCUMENT_PATH:?error} EDC_API_AUTH_KEY=${EDC_API_AUTH_KEY} +EDC_PARTICIPANT_ID=${EDC_PARTICIPANT_ID} + HOST_IP_ADDRESS=${HOST_IP_ADDRESS:?error} diff --git a/edc/resources/configs/config.properties b/edc/resources/configs/config.properties index ef7c6725..8225c230 100644 --- a/edc/resources/configs/config.properties +++ b/edc/resources/configs/config.properties @@ -12,14 +12,12 @@ web.http.identity.port=8186 web.http.identity.path=/identity edc.dataplane.token.validation.endpoint=http://${HOST_IP_ADDRESS}:8183/control/token -edc.ids.id=urn:connector:provider -edc.api.auth.key=${EDC_API_AUTH_KEY} +edc.dsp.callback.address=http://${HOST_IP_ADDRESS}:8282/protocol -edc.participant.id=provider +edc.api.auth.key=${EDC_API_AUTH_KEY} +edc.participant.id=${EDC_PARTICIPANT_ID} edc.hostname=${HOST_IP_ADDRESS} -edc.dsp.callback.address=http://${HOST_IP_ADDRESS}:8282/protocol - edc.jsonld.http.enabled=true edc.jsonld.https.enabled=true From f71f3c41b2252592c752b2f91474fa177612db9e Mon Sep 17 00:00:00 2001 From: julian-marco Date: Wed, 15 Nov 2023 13:48:37 +0100 Subject: [PATCH 3/3] throw out json-ld config + allow for https enforcement --- edc/resources/configs/config.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edc/resources/configs/config.properties b/edc/resources/configs/config.properties index 8225c230..dfb37726 100644 --- a/edc/resources/configs/config.properties +++ b/edc/resources/configs/config.properties @@ -18,8 +18,8 @@ edc.api.auth.key=${EDC_API_AUTH_KEY} edc.participant.id=${EDC_PARTICIPANT_ID} edc.hostname=${HOST_IP_ADDRESS} -edc.jsonld.http.enabled=true -edc.jsonld.https.enabled=true +# enable this in production +#edc.http.client.https.enforce=true edc.catalog.cache.execution.delay.seconds=10 edc.catalog.cache.execution.period.seconds=10