From a9339c1e6c6627efee584f613c5c2eaccd4e3c78 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 25 Oct 2025 17:03:47 +0200 Subject: [PATCH] fixes for deploy script --- deployment/bare_metal/.env.dist | 10 ++-------- deployment/bare_metal/start.sh | 1 + dlt-connector/.env.template | 25 +++++++++++++++++++++++++ inspector | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 dlt-connector/.env.template diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index abe2d0202..dc11fff71 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -22,14 +22,6 @@ EMAIL_CODE_VALID_TIME=1440 # also used for password reset code EMAIL_CODE_REQUEST_TIME=10 -# Need to adjust by updates -# config versions -DATABASE_CONFIG_VERSION=v1.2022-03-18 -BACKEND_CONFIG_VERSION=v23.2024-04-04 -FRONTEND_CONFIG_VERSION=v6.2024-02-27 -ADMIN_CONFIG_VERSION=v2.2024-01-04 -FEDERATION_CONFIG_VERSION=v2.2023-08-24 -FEDERATION_DHT_CONFIG_VERSION=v4.2024-01-17 FEDERATION_DHT_TOPIC=GRADIDO_HUB # Need adjustments for test system @@ -85,6 +77,8 @@ FEDERATION_COMMUNITY_APIS=1_0 # externe gradido services (more added in future) GDT_ACTIVE=false +AUTO_POLL_INTERVAL=30000 + # DLT-Connector (still in develop) DLT_CONNECTOR=false DLT_CONNECTOR_PORT=6010 diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 42b16a2f3..49e7c728b 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -259,6 +259,7 @@ MODULES=( ) if [ "$DLT_CONNECTOR" = true ] ; then MODULES+=("inspector") + MODULES+=("dlt-connector") fi if [ "$FAST_MODE" = false ] ; then diff --git a/dlt-connector/.env.template b/dlt-connector/.env.template new file mode 100644 index 000000000..963d0169b --- /dev/null +++ b/dlt-connector/.env.template @@ -0,0 +1,25 @@ +# SET LOG LEVEL AS NEEDED IN YOUR .ENV +# POSSIBLE VALUES: all | trace | debug | info | warn | error | fatal +# LOG_LEVEL=info + +HOME_COMMUNITY_SEED=$HOME_COMMUNITY_SEED + +# DLT-Connector +DLT_CONNECTOR_PORT=$DLT_CONNECTOR_PORT + +# Gradido Node Server URL +DLT_NODE_SERVER_PORT=$DLT_NODE_SERVER_PORT +DLT_GRADIDO_NODE_SERVER_VERSION=$DLT_GRADIDO_NODE_SERVER_VERSION + +HIERO_ACTIVE=$HIERO_ACTIVE +HIERO_HEDERA_NETWORK=$HIERO_HEDERA_NETWORK +HIERO_OPERATOR_ID=$HIERO_OPERATOR_ID +HIERO_OPERATOR_KEY=$HIERO_OPERATOR_KEY + +# Gradido Blockchain +GRADIDO_BLOCKCHAIN_CRYPTO_APP_SECRET=$GRADIDO_BLOCKCHAIN_CRYPTO_APP_SECRET +GRADIDO_BLOCKCHAIN_SERVER_CRYPTO_KEY=$GRADIDO_BLOCKCHAIN_SERVER_CRYPTO_KEY + +# Route to Backend +PORT=$PORT +JWT_SECRET=$JWT_SECRET \ No newline at end of file diff --git a/inspector b/inspector index 8e29fd44e..cf13ca7c3 160000 --- a/inspector +++ b/inspector @@ -1 +1 @@ -Subproject commit 8e29fd44efbede40649f850a674118e2d4379897 +Subproject commit cf13ca7c3fb225a05e9c414ce1691929bef43444