Merge pull request #130 from HS-OS-AG-Intelligente-Agrarsysteme/edc/c…

…onfig_improvements

some config improvements

dev.env

@@ -51,6 +51,8 @@ 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_PARTICIPANT_ID="provider"
 
 EDC_DB_USER="postgres"
 EDC_DB_PASSWORD="v8a9B15GQhIs"

edc/edc.env

@@ -1,11 +1,11 @@
-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}
+EDC_PARTICIPANT_ID=${EDC_PARTICIPANT_ID}
+
 
 HOST_IP_ADDRESS=${HOST_IP_ADDRESS:?error}
 

edc/resources/configs/config.properties

@@ -12,18 +12,17 @@ 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=password
-
-edc.participant.id=provider
 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.api.auth.key=${EDC_API_AUTH_KEY}
+edc.participant.id=${EDC_PARTICIPANT_ID}
+edc.hostname=${HOST_IP_ADDRESS}
+
+# enable this in production
+#edc.http.client.https.enforce=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