From 008b2d6c3fbe35d070dea4057f3c94208f2edc66 Mon Sep 17 00:00:00 2001 From: Nicolas Cantu Date: Sun, 21 Sep 2025 23:33:00 +0000 Subject: [PATCH] update submodule --- .env.exemple | 107 ------------------------------ .env.master.backup | 155 ------------------------------------------- .env.master.exemple | 157 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+), 262 deletions(-) delete mode 100644 .env.exemple delete mode 100644 .env.master.backup create mode 100644 .env.master.exemple diff --git a/.env.exemple b/.env.exemple deleted file mode 100644 index 890dbc2..0000000 --- a/.env.exemple +++ /dev/null @@ -1,107 +0,0 @@ -# Variables d'environnement pour l'application back-end -NODE_OPTIONS=--max-old-space-size=2048 -NODE_ENV=production - -# Configuration IDNOT -IDNOT_ANNUARY_BASE_URL=https://qual-api.notaires.fr/annuaire -# IDNOT_REDIRECT_URI=http://local.4nkweb.com:3004/authorized-client -IDNOT_REDIRECT_URI=http://local.4nkweb.com:3000/authorized-client -IDNOT_TOKEN_URL=https://qual-connexion.idnot.fr/user/IdPOAuth2/token/idnot_idp_v1 -IDNOT_API_BASE_URL=https://qual-api.notaires.fr - -# Configuration serveur -APP_HOST=dev4.4nkweb.com -# API_BASE_URL=https://demo.4nkweb.com/back -API_BASE_URL=https://dev4.4nkweb.com/back -# DEFAULT_STORAGE=https://demo.4nkweb.com/storage -DEFAULT_STORAGE=https://dev4.4nkweb.com/storage - -# Variables d'environnement pour l'application front-end -# NEXT_PUBLIC_4NK_URL=http://demo.4nkweb.com/ -NEXT_PUBLIC_4NK_URL=https://dev4.4nkweb.com -# NEXT_PUBLIC_FRONT_APP_HOST=https://demo.4nkweb.com -NEXT_PUBLIC_FRONT_APP_HOST=https://dev4.4nkweb.com/lecoffre -NEXT_PUBLIC_FRONT_APP_PORT=443 -NEXT_PUBLIC_IDNOT_BASE_URL=https://qual-connexion.idnot.fr -NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT=/IdPOAuth2/authorize/idnot_idp_v1 -NEXT_PUBLIC_BACK_API_PROTOCOL=https -NEXT_PUBLIC_BACK_API_HOST=dev4.4nkweb.com -NEXT_PUBLIC_BACK_API_PORT=443 -NEXT_PUBLIC_BACK_API_ROOT_URL=/api -NEXT_PUBLIC_BACK_API_VERSION=v1 -# NEXT_PUBLIC_ANK_BASE_REDIRECT_URI='http://local.4nkweb.com:3004/authorized-client' -NEXT_PUBLIC_ANK_BASE_REDIRECT_URI=https://dev4.4nkweb.com/lecoffre/authorized-client -NEXT_PUBLIC_TARGET_ORIGIN=https://dev4.4nkweb.com/lecoffre -NEXT_PUBLIC_4NK_IFRAME_URL=https://dev4.4nkweb.com -NEXT_PUBLIC_IDNOT_REDIRECT_URI=http://local.4nkweb.com:3000/authorized-client - -NEXT_PUBLIC_DOCAPOSTE_API_URL= -NEXT_PUBLIC_API_URL=https://dev4.4nkweb.com/api -NEXT_PUBLIC_DEFAULT_VALIDATOR_ID=28c9a3a8151bef545ebf700ca5222c63d0031ad593097e95c1de202464304a99 -NEXT_PUBLIC_DEFAULT_STORAGE_URLS=https://dev4.4nkweb.com/storage - -# WS -# RELAY_URLS=wss://demo.4nkweb.com/ws -RELAY_URLS=wss://dev4.4nkweb.com/ws - -# SIGNER_WS_URL=ws://dev4.4nkweb.com/signer/ -SIGNER_WS_URL=ws://dev3.4nkweb.com -SIGNER_BASE_URL=https://dev3.4nkweb.com - - -# IHM URLS -# VITE_BOOTSTRAPURL=http://sdk_relay:8090/ -VITE_BOOTSTRAPURL=https://dev3.4nkweb.com/ws/ - -# Cartes de test Stripe -SUCCES='4242 4242 4242 4242' -DECLINED='4000 0025 0000 3155' -ENABLE_SUBSCRIPTION_STUB=true -CORS_ALLOWED_ORIGINS=http://local.4nkweb.com:3000,https://dev4.4nkweb.com - -core_url=http://bitcoin:38332 -ws_url=0.0.0.0:8090 -wallet_name=default -network=signet -blindbit_url=http://blindbit:8000 -zmq_url=tcp://bitcoin:29000 -storage=https://dev4.4nkweb.com/storage -data_dir=/home/bitcoin/.4nk -bitcoin_data_dir=/home/bitcoin/.bitcoin -bootstrap_url=wss://dev3.4nkweb.com/ws/ -bootstrap_faucet=true -RUST_LOG=DEBUG, -NODE_OPTIONS=--max-old-space-size=2048 - - -# ================================= /!\ sensible ======================== - -IDNOT_API_KEY= -IDNOT_CLIENT_ID= -IDNOT_CLIENT_SECRET= -NEXT_PUBLIC_IDNOT_CLIENT_ID= - -# Configuration OVH -OVH_APP_KEY= -OVH_APP_SECRET= -OVH_CONSUMER_KEY= -OVH_SMS_SERVICE_NAME= - -# Configuration SMS Factor -SMS_FACTOR_TOKEN= - -# Configuration Mailchimp -MAILCHIMP_API_KEY= -MAILCHIMP_KEY= -MAILCHIMP_LIST_ID= - -# Configuration Stripe -STRIPE_SECRET_KEY= -STRIPE_WEBHOOK_SECRET= -STRIPE_STANDARD_SUBSCRIPTION_PRICE_ID= -STRIPE_STANDARD_ANNUAL_SUBSCRIPTION_PRICE_ID= -STRIPE_UNLIMITED_SUBSCRIPTION_PRICE_ID= -STRIPE_UNLIMITED_ANNUAL_SUBSCRIPTION_PRICE_ID= - -SIGNER_API_KEY=your-api-key-change-this -VITE_JWT_SECRET_KEY=52b3d77617bb00982dfee15b08effd52cfe5b2e69b2f61cc4848cfe1e98c0bc9 \ No newline at end of file diff --git a/.env.master.backup b/.env.master.backup deleted file mode 100644 index 2559e9f..0000000 --- a/.env.master.backup +++ /dev/null @@ -1,155 +0,0 @@ -# DOMAIN -DOMAIN=dev4.4nkweb.com - -# Variables d'environnement pour l'application back-end -NODE_OPTIONS=--max-old-space-size=2048 -NODE_ENV=production - -# Configuration IDNOT -IDNOT_ANNUARY_BASE_URL=https://qual-api.notaires.fr/annuaire -IDNOT_REDIRECT_URI=http://local.4nkweb.com:3000/authorized-client -IDNOT_TOKEN_URL=https://qual-connexion.idnot.fr/user/IdPOAuth2/token/idnot_idp_v1 -IDNOT_API_BASE_URL=https://qual-api.notaires.fr - -# Configuration serveur -APP_HOST=dev4.4nkweb.com -API_BASE_URL=https://dev4.4nkweb.com/back -DEFAULT_STORAGE=https://dev4.4nkweb.com/storage - -# Variables d'environnement pour l'application front-end -NEXT_PUBLIC_4NK_URL=https://dev4.4nkweb.com -NEXT_PUBLIC_FRONT_APP_HOST=https://dev4.4nkweb.com/lecoffre -NEXT_PUBLIC_IDNOT_BASE_URL=https://qual-connexion.idnot.fr -NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT=/IdPOAuth2/authorize/idnot_idp_v1 -NEXT_PUBLIC_BACK_API_PROTOCOL=https -NEXT_PUBLIC_BACK_API_HOST=dev4.4nkweb.com -NEXT_PUBLIC_BACK_API_PORT=443 -NEXT_PUBLIC_BACK_API_ROOT_URL=/api -NEXT_PUBLIC_BACK_API_VERSION=v1 -NEXT_PUBLIC_ANK_BASE_REDIRECT_URI=https://dev4.4nkweb.com/lecoffre/authorized-client -NEXT_PUBLIC_TARGET_ORIGIN=https://dev4.4nkweb.com/lecoffre -NEXT_PUBLIC_4NK_IFRAME_URL=https://dev4.4nkweb.com -NEXT_PUBLIC_IDNOT_REDIRECT_URI=https://dev4.4nkweb.com/lecoffre/authorized-client -NEXT_PUBLIC_DOCAPOSTE_API_URL= -NEXT_PUBLIC_API_URL=https://dev4.4nkweb.com/api -NEXT_PUBLIC_DEFAULT_VALIDATOR_ID=28c9a3a8151bef545ebf700ca5222c63d0031ad593097e95c1de202464304a99 -NEXT_PUBLIC_DEFAULT_STORAGE_URLS=https://dev4.4nkweb.com/storage - -# WS -RELAY_URLS=wss://dev4.4nkweb.com/ws/,wss://dev3.4nkweb.com/ws/ - -# SIGNER -SIGNER_WS_URL=ws://dev3.4nkweb.com:9090 -SIGNER_BASE_URL=https://dev3.4nkweb.com - -# IHM URLS -VITE_BOOTSTRAPURL=wss://dev3.4nkweb.com/ws/ - -# Cartes de test Stripe -SUCCES='4242 4242 4242 4242' -DECLINED='4000 0025 0000 3155' -ENABLE_SUBSCRIPTION_STUB=true -CORS_ALLOWED_ORIGINS=http://local.4nkweb.com:3000,https://dev4.4nkweb.com - -core_url=http://bitcoin:38332 -ws_url=0.0.0.0:8090 -wallet_name=default -network=signet -blindbit_url=http://blindbit:8000 -zmq_url=tcp://bitcoin:29000 -storage=https://dev4.4nkweb.com/storage -data_dir=/home/bitcoin/.4nk -bitcoin_data_dir=/home/bitcoin/.bitcoin -bootstrap_url=wss://dev3.4nkweb.com/ws/ -bootstrap_faucet=true - -RUST_LOG=DEBUG, -NODE_OPTIONS=--max-old-space-size=2048 - -# ================== /!\ sensible ========================= - -# Configuration IDNOT -IDNOT_API_KEY=ba557f84-0bf6-4dbf-844f-df2767555e3e -IDNOT_CLIENT_ID=B3CE56353EDB15A9 -IDNOT_CLIENT_SECRET=3F733549E879878344B6C949B366BB5CDBB2DB5B7F7AB7EBBEBB0F0DD0776D1C -NEXT_PUBLIC_IDNOT_CLIENT_ID=B3CE56353EDB15A9 - -# Configuration OVH -OVH_APP_KEY=5ab0709bbb65ef26 -OVH_APP_SECRET=de1fac1779d707d263a611a557cd5766 -OVH_CONSUMER_KEY=5fe817829b8a9c780cfa2354f8312ece -OVH_SMS_SERVICE_NAME=sms-tt802880-1 -OVH_APPLICATION_KEY=5ab0709bbb65ef26 -OVH_APPLICATION_SECRET=de1fac1779d707d263a611a557cd5766 -OVH_SERVICE_NAME=sms-tt802880-1 - -# Configuration SMS Factor -SMS_FACTOR_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI4NzgzNiIsImlhdCI6MTcwMTMzOTY1Mi45NDUzOH0.GNoqLb5MDBWuniNlQjbr1PKolwxGqBZe_tf4IMObvHw - -# Configuration Mailchimp -MAILCHIMP_API_KEY=md-VVfaml-ApIV4nsGgaJKl0A -MAILCHIMP_KEY=3fa54304bc766dfd0b8043a827b28a3a-us17 -MAILCHIMP_LIST_ID=a48d9ad852 - -# Configuration Stripe -STRIPE_SECRET_KEY=sk_test_51OwKmMP5xh1u9BqSeFpqw0Yr15hHtFsh0pvRGaE0VERhlYtvw33ND1qiGA6Dy1DPmmV61B6BqIimlhuv7bwElhjF00PLQwD60n -STRIPE_PUBLISHABLE_KEY=pk_test_51OwKmMP5xh1u9BqSeFpqw0Yr15hHtFsh0pvRGaE0VERhlYtvw33ND1qiGA6Dy1DPmmV61B6BqIimlhuv7bwElhjF00PLQwD60n -STRIPE_WEBHOOK_SECRET= -STRIPE_STANDARD_SUBSCRIPTION_PRICE_ID=price_1P66fuP5xh1u9BqSHj0O6Uy3 -STRIPE_STANDARD_ANNUAL_SUBSCRIPTION_PRICE_ID=price_1P9NsRP5xh1u9BqSFgkUDbQY -STRIPE_UNLIMITED_SUBSCRIPTION_PRICE_ID=price_1P66RqP5xh1u9BqSuUzkQNac -STRIPE_UNLIMITED_ANNUAL_SUBSCRIPTION_PRICE_ID=price_1P9NpKP5xh1u9BqSApFogvUB - -SIGNER_API_KEY=your-api-key-change-this -VITE_JWT_SECRET_KEY=52b3d77617bb00982dfee15b08effd52cfe5b2e69b2f61cc4848cfe1e98c0bc9 - -# Configuration pour réduire les traces Docker -DOCKER_LOG_LEVEL=info -COMPOSE_LOG_LEVEL=WARNING - -# =========================================== -# VARIABLES SDK_SIGNER (manquantes) -# =========================================== -SIGNER_PORT=9090 -SIGNER_DATABASE_PATH=./data/server.db -SIGNER_RELAY_URLS=wss://dev4.4nkweb.com/ws/,wss://dev3.4nkweb.com/ws/ -SIGNER_AUTO_RESTART=true -SIGNER_MAX_RESTARTS=3 -SIGNER_LOG_LEVEL=info - -# =========================================== -# VARIABLES SDK_RELAY (formatées pour docker-compose) -# =========================================== -SDK_RELAY_CORE_URL=http://bitcoin:38332 -SDK_RELAY_WS_URL=0.0.0.0:8090 -SDK_RELAY_WALLET_NAME=default -SDK_RELAY_NETWORK=signet -SDK_RELAY_BLINDBIT_URL=http://blindbit:8000 -SDK_RELAY_ZMQ_URL=tcp://bitcoin:29000 -SDK_RELAY_STORAGE=https://dev4.4nkweb.com/storage -SDK_RELAY_DATA_DIR=/app/.4nk -SDK_RELAY_BITCOIN_DATA_DIR=/app/.bitcoin -SDK_RELAY_BOOTSTRAP_URL=wss://dev3.4nkweb.com/ws/ -SDK_RELAY_BOOTSTRAP_FAUCET=true - -# =========================================== -# VARIABLES IHM_CLIENT (formatées pour docker-compose) -# =========================================== -VITE_API_BASE_URL=https://dev4.4nkweb.com/back/api/v1 -VITE_WS_URL=wss://dev4.4nkweb.com/ws/ -VITE_STORAGE_URL=https://dev4.4nkweb.com/storage -VITE_SIGNER_URL=https://dev4.4nkweb.com/signer - -# =========================================== -# VARIABLES MONITORING -# =========================================== -GRAFANA_ADMIN_USER=admin -GRAFANA_ADMIN_PASSWORD=admin123 -LOKI_URL=http://loki:3100 -PROMTAIL_CONFIG_FILE=/etc/promtail/config.yml - -# =========================================== -# VARIABLES MANQUANTES POUR DOCKER-COMPOSE -# =========================================== -# Mailchimp -MAILCHIMP_SERVER_PREFIX=us17 diff --git a/.env.master.exemple b/.env.master.exemple new file mode 100644 index 0000000..ba5961f --- /dev/null +++ b/.env.master.exemple @@ -0,0 +1,157 @@ +# DOMAIN +DOMAIN=dev4.4nkweb.com +BOOTSTRAP_DOMAIN=dev3.4nkweb.com +LOCAL_DOMAIN=local.4nkweb.com + +# Variables d'environnement pour l'application back-end +NODE_OPTIONS=--max-old-space-size=2048 +NODE_ENV=production + +# Configuration IDNOT +IDNOT_ANNUARY_BASE_URL=https://qual-api.notaires.fr/annuaire +IDNOT_REDIRECT_URI=http://${LOCAL_DOMAIN}:3000/authorized-client +IDNOT_TOKEN_URL=https://qual-connexion.idnot.fr/user/IdPOAuth2/token/idnot_idp_v1 +IDNOT_API_BASE_URL=https://qual-api.notaires.fr + +# Configuration serveur +APP_HOST=${DOMAIN} +API_BASE_URL=https://${DOMAIN}/back +DEFAULT_STORAGE=https://${DOMAIN}/storage + +# Variables d'environnement pour l'application front-end +NEXT_PUBLIC_4NK_URL=https://${DOMAIN} +NEXT_PUBLIC_FRONT_APP_HOST=https://${DOMAIN}/lecoffre +NEXT_PUBLIC_IDNOT_BASE_URL=https://qual-connexion.idnot.fr +NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT=/IdPOAuth2/authorize/idnot_idp_v1 +NEXT_PUBLIC_BACK_API_PROTOCOL=https +NEXT_PUBLIC_BACK_API_HOST=${DOMAIN} +NEXT_PUBLIC_BACK_API_PORT=443 +NEXT_PUBLIC_BACK_API_ROOT_URL=/api +NEXT_PUBLIC_BACK_API_VERSION=v1 +NEXT_PUBLIC_ANK_BASE_REDIRECT_URI=https://${DOMAIN}/lecoffre/authorized-client +NEXT_PUBLIC_TARGET_ORIGIN=https://${DOMAIN}/lecoffre +NEXT_PUBLIC_4NK_IFRAME_URL=https://${DOMAIN} +NEXT_PUBLIC_IDNOT_REDIRECT_URI=https://${DOMAIN}/lecoffre/authorized-client +NEXT_PUBLIC_DOCAPOSTE_API_URL= +NEXT_PUBLIC_API_URL=https://${DOMAIN}/api +NEXT_PUBLIC_DEFAULT_VALIDATOR_ID= +NEXT_PUBLIC_DEFAULT_STORAGE_URLS=https://${DOMAIN}/storage + +# WS +RELAY_URLS=wss://${DOMAIN}/ws/,wss://${BOOTSTRAP_DOMAIN}/ws/ + +# SIGNER +SIGNER_WS_URL=ws://${BOOTSTRAP_DOMAIN}:9090 +SIGNER_BASE_URL=https://${BOOTSTRAP_DOMAIN} + +# IHM URLS +VITE_BOOTSTRAPURL=wss://${BOOTSTRAP_DOMAIN}/ws/ + +# Cartes de test Stripe +SUCCES='4242 4242 4242 4242' +DECLINED='4000 0025 0000 3155' +ENABLE_SUBSCRIPTION_STUB=true +CORS_ALLOWED_ORIGINS=http://${LOCAL_DOMAIN}:3000,https://${DOMAIN} + +core_url=http://bitcoin:38332 +ws_url=0.0.0.0:8090 +wallet_name=default +network=signet +blindbit_url=http://blindbit:8000 +zmq_url=tcp://bitcoin:29000 +storage=https://${DOMAIN}/storage +data_dir=/home/bitcoin/.4nk +bitcoin_data_dir=/home/bitcoin/.bitcoin +bootstrap_url=wss://${BOOTSTRAP_DOMAIN}/ws/ +bootstrap_faucet=true + +RUST_LOG=DEBUG, +NODE_OPTIONS=--max-old-space-size=2048 + +# ================== /!\ sensible ========================= + +# Configuration IDNOT +IDNOT_API_KEY +IDNOT_CLIENT_ID= +IDNOT_CLIENT_SECRET= +NEXT_PUBLIC_IDNOT_CLIENT_ID= + +# Configuration OVH +OVH_APP_KEY= +OVH_APP_SECRET= +OVH_CONSUMER_KEY= +OVH_SMS_SERVICE_NAME= +OVH_APPLICATION_KEY= +OVH_APPLICATION_SECRET= +OVH_SERVICE_NAME= + +# Configuration SMS Factor +SMS_FACTOR_TOKEN= + +# Configuration Mailchimp +MAILCHIMP_API_KEY= +MAILCHIMP_KEY= +MAILCHIMP_LIST_ID= + +# Configuration Stripe +STRIPE_SECRET_KEY= +STRIPE_PUBLISHABLE_KEY= +STRIPE_WEBHOOK_SECRET= +STRIPE_STANDARD_SUBSCRIPTION_PRICE_ID= +STRIPE_STANDARD_ANNUAL_SUBSCRIPTION_PRICE_ID= +STRIPE_UNLIMITED_SUBSCRIPTION_PRICE_ID= +STRIPE_UNLIMITED_ANNUAL_SUBSCRIPTION_PRICE_ID= + +SIGNER_API_KEY= +VITE_JWT_SECRET_KEY= + +# Configuration pour réduire les traces Docker +DOCKER_LOG_LEVEL=info +COMPOSE_LOG_LEVEL=WARNING + +# =========================================== +# VARIABLES SDK_SIGNER (manquantes) +# =========================================== +SIGNER_PORT=9090 +SIGNER_DATABASE_PATH=./data/server.db +SIGNER_RELAY_URLS=wss://${DOMAIN}/ws/,wss://${BOOTSTRAP_DOMAIN}/ws/ +SIGNER_AUTO_RESTART=true +SIGNER_MAX_RESTARTS=3 +SIGNER_LOG_LEVEL=info + +# =========================================== +# VARIABLES SDK_RELAY (formatées pour docker-compose) +# =========================================== +SDK_RELAY_CORE_URL=http://bitcoin:38332 +SDK_RELAY_WS_URL=0.0.0.0:8090 +SDK_RELAY_WALLET_NAME=default +SDK_RELAY_NETWORK=signet +SDK_RELAY_BLINDBIT_URL=http://blindbit:8000 +SDK_RELAY_ZMQ_URL=tcp://bitcoin:29000 +SDK_RELAY_STORAGE=https://${DOMAIN}/storage +SDK_RELAY_DATA_DIR=/app/.4nk +SDK_RELAY_BITCOIN_DATA_DIR=/app/.bitcoin +SDK_RELAY_BOOTSTRAP_URL=wss://${BOOTSTRAP_DOMAIN}/ws/ +SDK_RELAY_BOOTSTRAP_FAUCET=true + +# =========================================== +# VARIABLES IHM_CLIENT (formatées pour docker-compose) +# =========================================== +VITE_API_BASE_URL=https://${DOMAIN}/back/api/v1 +VITE_WS_URL=wss://${DOMAIN}/ws/ +VITE_STORAGE_URL=https://${DOMAIN}/storage +VITE_SIGNER_URL=https://${DOMAIN}/signer + +# =========================================== +# VARIABLES MONITORING +# =========================================== +GRAFANA_ADMIN_USER=admin +GRAFANA_ADMIN_PASSWORD=admin123 +LOKI_URL=http://loki:3100 +PROMTAIL_CONFIG_FILE=/etc/promtail/config.yml + +# =========================================== +# VARIABLES MANQUANTES POUR DOCKER-COMPOSE +# =========================================== +# Mailchimp +MAILCHIMP_SERVER_PREFIX=us17