4nk/4NK_vault
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: export automatique des variables pendant le remplacement + ZMQ Bitcoin OK\n\n- set -a lors du chargement des .env pour envsubst\n- correction des sorties generate_variables.sh (noms, urls, ports)\n- template bitcoin.conf avec host:port pour ZMQ\n- vérifié: storage/dev/_4NK_modules/bitcoin/bitcoin.conf contient zmqpubhashblock=tcp://bitcoin:28332

Browse Source
This commit is contained in:
4NK Dev 2025-10-05 14:25:04 +00:00
parent 3ee209b255
commit 4d52e43235
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/dev/generate_variables.sh
View File

@ -48,7 +48,7 @@ generate_variables() {
printf '%s_SCRIPTS_DIR=$DOCKER_GLOBAL/scripts/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" printf '%s_SCRIPTS_DIR=$DOCKER_GLOBAL/scripts/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')"
printf '%s_DOCKER_WORKING_DIR=/home/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" printf '%s_DOCKER_WORKING_DIR=/home/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')"
echo "" echo ""
printf '%s_DOCKER_CONFS_DIR=$DOCKER_GLOBAL/confs/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" printf '%s_DOCKER_CONFS_DIR=$DOCKER_GLOBAL/confs/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')"
printf '%s_DOCKER_LOGS_DIR=$DOCKER_GLOBAL/logs/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" printf '%s_DOCKER_LOGS_DIR=$DOCKER_GLOBAL/logs/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')"
printf '%s_DOCKER_RUNS_DIR=$DOCKER_GLOBAL/runs/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" printf '%s_DOCKER_RUNS_DIR=$DOCKER_GLOBAL/runs/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')"
@ -62,7 +62,7 @@ generate_variables() {
printf '%s_URL_EXTERNAL=https://$HOST$%s_URL_ROUTE\n' "$VARIABLE" "$VARIABLE" printf '%s_URL_EXTERNAL=https://$HOST$%s_URL_ROUTE\n' "$VARIABLE" "$VARIABLE"
printf '%s_URL_WS=ws://$%s_DOCKER_PORT\n' "$VARIABLE" "$VARIABLE" printf '%s_URL_WS=ws://$%s_DOCKER_PORT\n' "$VARIABLE" "$VARIABLE"
printf '%s_URL_WS_EXTERNAL=wss://$HOST/ws\n' "$VARIABLE" printf '%s_URL_WS_EXTERNAL=wss://$HOST/ws\n' "$VARIABLE"
# Générer les ports spécifiques pour Bitcoin # Générer les ports spécifiques pour Bitcoin
if [ "$VARIABLE" = "BITCOIN" ]; then if [ "$VARIABLE" = "BITCOIN" ]; then
echo "BITCOIN_ZMQPBUBHASHBLOCK_PORT=28332" echo "BITCOIN_ZMQPBUBHASHBLOCK_PORT=28332"
@ -70,7 +70,7 @@ generate_variables() {
echo "BITCOIN_SIGNET_P2P_PORT=38332" echo "BITCOIN_SIGNET_P2P_PORT=38332"
echo "BITCOIN_SIGNET_RPC_PORT=38333" echo "BITCOIN_SIGNET_RPC_PORT=38333"
fi fi
echo "" echo ""
echo " echo "
\$${VARIABLE}_DOCKER_NAME: \$${VARIABLE}_DOCKER_NAME:

6
templates/dev/replace_variables_and_copy.sh
View File

@ -31,6 +31,9 @@ FILES_COPIED=0
load_all_env_vars() { load_all_env_vars() {
print_step "Chargement des variables d'environnement" print_step "Chargement des variables d'environnement"
# Exporter automatiquement toutes les variables sourcées
set -a
local env_files=(".env.secrets" ".env") local env_files=(".env.secrets" ".env")
local total_vars=0 local total_vars=0
@ -114,6 +117,9 @@ load_all_env_vars() {
rm -f "$temp_env" rm -f "$temp_env"
fi fi
# Désactiver l'export automatique
set +a
print_success "$total_vars variables d'environnement chargées" print_success "$total_vars variables d'environnement chargées"
} }