From 4e5c62c651504226207ebf1816d17d1a3a33fdb6 Mon Sep 17 00:00:00 2001 From: Stephan D Date: Tue, 17 Mar 2026 01:54:55 +0100 Subject: [PATCH] fix of scripts --- ci/devserver/.env.runtime | 1 + ci/prod/scripts/deploy/bff.sh | 9 +++++++-- ci/prod/scripts/deploy/callbacks.sh | 9 +++++++-- ci/prod/scripts/deploy/chain_gateway.sh | 9 +++++++-- ci/prod/scripts/deploy/tron_gateway.sh | 9 +++++++-- frontend/pweb/caddy/Caddyfile | 2 +- 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/ci/devserver/.env.runtime b/ci/devserver/.env.runtime index 8ccb7bef..7e29e0ba 100644 --- a/ci/devserver/.env.runtime +++ b/ci/devserver/.env.runtime @@ -4,6 +4,7 @@ AMPLI_ENVIRONMENT=development API_PROTOCOL=https SERVICE_HOST=dev.sendico.io WS_PROTOCOL=wss +CADDY_ACME_CA=https://acme-v02.api.letsencrypt.org/directory SSH_HOST=178.57.67.136 SSH_USER=cloud diff --git a/ci/prod/scripts/deploy/bff.sh b/ci/prod/scripts/deploy/bff.sh index 422f075a..8528b7c0 100755 --- a/ci/prod/scripts/deploy/bff.sh +++ b/ci/prod/scripts/deploy/bff.sh @@ -138,12 +138,17 @@ decode_b64() { MONGO_USER="$(decode_b64 "$MONGO_USER_B64")" MONGO_PASSWORD="$(decode_b64 "$MONGO_PASSWORD_B64")" API_ENDPOINT_SECRET="$(decode_b64 "$API_ENDPOINT_SECRET_B64")" -BFF_VAULT_ROLE_ID="$(decode_b64 "$BFF_VAULT_ROLE_ID_B64")" -BFF_VAULT_SECRET_ID="$(decode_b64 "$BFF_VAULT_SECRET_ID_B64")" NATS_USER="$(decode_b64 "$NATS_USER_B64")" NATS_PASSWORD="$(decode_b64 "$NATS_PASSWORD_B64")" NATS_URL="$(decode_b64 "$NATS_URL_B64")" +if decoded="$(decode_b64 "$BFF_VAULT_ROLE_ID_B64")" && [[ -n "$decoded" ]]; then + BFF_VAULT_ROLE_ID="$decoded" +fi +if decoded="$(decode_b64 "$BFF_VAULT_SECRET_ID_B64")" && [[ -n "$decoded" ]]; then + BFF_VAULT_SECRET_ID="$decoded" +fi + export MONGO_USER MONGO_PASSWORD API_ENDPOINT_SECRET export BFF_VAULT_ROLE_ID BFF_VAULT_SECRET_ID export NATS_USER NATS_PASSWORD NATS_URL diff --git a/ci/prod/scripts/deploy/callbacks.sh b/ci/prod/scripts/deploy/callbacks.sh index 03848040..898b9af1 100755 --- a/ci/prod/scripts/deploy/callbacks.sh +++ b/ci/prod/scripts/deploy/callbacks.sh @@ -134,12 +134,17 @@ decode_b64() { CALLBACKS_MONGO_USER="$(decode_b64 "$CALLBACKS_MONGO_USER_B64")" CALLBACKS_MONGO_PASSWORD="$(decode_b64 "$CALLBACKS_MONGO_PASSWORD_B64")" -CALLBACKS_VAULT_ROLE_ID="$(decode_b64 "$CALLBACKS_VAULT_ROLE_ID_B64")" -CALLBACKS_VAULT_SECRET_ID="$(decode_b64 "$CALLBACKS_VAULT_SECRET_ID_B64")" NATS_USER="$(decode_b64 "$NATS_USER_B64")" NATS_PASSWORD="$(decode_b64 "$NATS_PASSWORD_B64")" NATS_URL="$(decode_b64 "$NATS_URL_B64")" +if decoded="$(decode_b64 "$CALLBACKS_VAULT_ROLE_ID_B64")" && [[ -n "$decoded" ]]; then + CALLBACKS_VAULT_ROLE_ID="$decoded" +fi +if decoded="$(decode_b64 "$CALLBACKS_VAULT_SECRET_ID_B64")" && [[ -n "$decoded" ]]; then + CALLBACKS_VAULT_SECRET_ID="$decoded" +fi + export CALLBACKS_MONGO_USER CALLBACKS_MONGO_PASSWORD export CALLBACKS_VAULT_ROLE_ID CALLBACKS_VAULT_SECRET_ID export NATS_USER NATS_PASSWORD NATS_URL diff --git a/ci/prod/scripts/deploy/chain_gateway.sh b/ci/prod/scripts/deploy/chain_gateway.sh index 7ee5889e..4a9c8a9f 100755 --- a/ci/prod/scripts/deploy/chain_gateway.sh +++ b/ci/prod/scripts/deploy/chain_gateway.sh @@ -146,12 +146,17 @@ CHAIN_GATEWAY_MONGO_PASSWORD="$(decode_b64 "$CHAIN_GATEWAY_MONGO_PASSWORD_B64")" CHAIN_GATEWAY_RPC_URL="$(decode_b64 "$CHAIN_GATEWAY_RPC_URL_B64")" CHAIN_GATEWAY_SERVICE_WALLET_KEY="$(decode_b64 "$CHAIN_GATEWAY_SERVICE_WALLET_KEY_B64")" CHAIN_GATEWAY_SERVICE_WALLET_ADDRESS="$(decode_b64 "$CHAIN_GATEWAY_SERVICE_WALLET_ADDRESS_B64")" -CHAIN_GATEWAY_VAULT_ROLE_ID="$(decode_b64 "$CHAIN_GATEWAY_VAULT_ROLE_ID_B64")" -CHAIN_GATEWAY_VAULT_SECRET_ID="$(decode_b64 "$CHAIN_GATEWAY_VAULT_SECRET_ID_B64")" NATS_USER="$(decode_b64 "$NATS_USER_B64")" NATS_PASSWORD="$(decode_b64 "$NATS_PASSWORD_B64")" NATS_URL="$(decode_b64 "$NATS_URL_B64")" +if decoded="$(decode_b64 "$CHAIN_GATEWAY_VAULT_ROLE_ID_B64")" && [[ -n "$decoded" ]]; then + CHAIN_GATEWAY_VAULT_ROLE_ID="$decoded" +fi +if decoded="$(decode_b64 "$CHAIN_GATEWAY_VAULT_SECRET_ID_B64")" && [[ -n "$decoded" ]]; then + CHAIN_GATEWAY_VAULT_SECRET_ID="$decoded" +fi + export CHAIN_GATEWAY_MONGO_USER CHAIN_GATEWAY_MONGO_PASSWORD export CHAIN_GATEWAY_RPC_URL export CHAIN_GATEWAY_SERVICE_WALLET_KEY CHAIN_GATEWAY_SERVICE_WALLET_ADDRESS diff --git a/ci/prod/scripts/deploy/tron_gateway.sh b/ci/prod/scripts/deploy/tron_gateway.sh index fb7a4e27..ea13bc8f 100755 --- a/ci/prod/scripts/deploy/tron_gateway.sh +++ b/ci/prod/scripts/deploy/tron_gateway.sh @@ -152,12 +152,17 @@ TRON_GATEWAY_GRPC_URL="$(decode_b64 "$TRON_GATEWAY_GRPC_URL_B64")" TRON_GATEWAY_GRPC_TOKEN="$(decode_b64 "$TRON_GATEWAY_GRPC_TOKEN_B64")" TRON_GATEWAY_SERVICE_WALLET_KEY="$(decode_b64 "$TRON_GATEWAY_SERVICE_WALLET_KEY_B64")" TRON_GATEWAY_SERVICE_WALLET_ADDRESS="$(decode_b64 "$TRON_GATEWAY_SERVICE_WALLET_ADDRESS_B64")" -TRON_GATEWAY_VAULT_ROLE_ID="$(decode_b64 "$TRON_GATEWAY_VAULT_ROLE_ID_B64")" -TRON_GATEWAY_VAULT_SECRET_ID="$(decode_b64 "$TRON_GATEWAY_VAULT_SECRET_ID_B64")" NATS_USER="$(decode_b64 "$NATS_USER_B64")" NATS_PASSWORD="$(decode_b64 "$NATS_PASSWORD_B64")" NATS_URL="$(decode_b64 "$NATS_URL_B64")" +if decoded="$(decode_b64 "$TRON_GATEWAY_VAULT_ROLE_ID_B64")" && [[ -n "$decoded" ]]; then + TRON_GATEWAY_VAULT_ROLE_ID="$decoded" +fi +if decoded="$(decode_b64 "$TRON_GATEWAY_VAULT_SECRET_ID_B64")" && [[ -n "$decoded" ]]; then + TRON_GATEWAY_VAULT_SECRET_ID="$decoded" +fi + export TRON_GATEWAY_MONGO_USER TRON_GATEWAY_MONGO_PASSWORD export TRON_GATEWAY_RPC_URL TRON_GATEWAY_GRPC_URL TRON_GATEWAY_GRPC_TOKEN export TRON_GATEWAY_SERVICE_WALLET_KEY TRON_GATEWAY_SERVICE_WALLET_ADDRESS diff --git a/frontend/pweb/caddy/Caddyfile b/frontend/pweb/caddy/Caddyfile index 304d82c3..601e62c5 100644 --- a/frontend/pweb/caddy/Caddyfile +++ b/frontend/pweb/caddy/Caddyfile @@ -3,7 +3,7 @@ ######################################## { email {$CADDY_ACME_EMAIL} - acme_ca https://acme.zerossl.com/v2/DV90 + acme_ca {$CADDY_ACME_CA:https://acme.zerossl.com/v2/DV90} # debug } -- 2.49.1