From ce02828495ff921dddcfeb2498dd40d66aae05dd Mon Sep 17 00:00:00 2001 From: Nicolas Cantu Date: Wed, 24 Sep 2025 15:37:18 +0000 Subject: [PATCH] chore(nginx): backup host and project nginx configs; add deploy script & docs; switch front to CI image --- .env.master | 8 +- .env.master.bak_1758718255 | 172 +++++++++++++++++++++++++++++++++ .env.master.bak_1758718268 | 172 +++++++++++++++++++++++++++++++++ .env.master.bak_20250922162546 | 138 ++++++++++++++++---------- docker-compose.yml | 26 +---- 5 files changed, 435 insertions(+), 81 deletions(-) create mode 100644 .env.master.bak_1758718255 create mode 100644 .env.master.bak_1758718268 diff --git a/.env.master b/.env.master index 48f86dd..8aae51d 100644 --- a/.env.master +++ b/.env.master @@ -137,11 +137,11 @@ STRIPE_UNLIMITED_SUBSCRIPTION_PRICE_ID=price_1P66RqP5xh1u9BqSuUzkQNac STRIPE_UNLIMITED_ANNUAL_SUBSCRIPTION_PRICE_ID=price_1P9NpKP5xh1u9BqSApFogvUB # Configuration back-end -IDNOT_CLIENT_ID=4501646203F3EF67 +IDNOT_CLIENT_ID=B3CE56353EDB15A9 IDNOT_CLIENT_SECRET=3F733549E879878344B6C949B366BB5CDBB2DB5B7F7AB7EBBEBB0F0DD0776D1C -"IDNOT_REDIRECT_URI"=https://lecoffreio.4nkweb.com/authorized-client +IDNOT_REDIRECT_URI=https://lecoffreio.4nkweb.com/authorized-client IDNOT_TOKEN_URL=https://qual-connexion.idnot.fr/user/IdPOAuth2/token/idnot_idp_v1 -IDNOT_API_BASE_URL=https://qual-api.notaires +IDNOT_API_BASE_URL=https://qual-api.notaires.fr # Configuration front-end @@ -150,7 +150,7 @@ 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_IDNOT_CLIENT_ID=4501646203F3EF67 +NEXT_PUBLIC_IDNOT_CLIENT_ID=B3CE56353EDB15A9 NEXT_PUBLIC_BACK_API_PROTOCOL=https NEXT_PUBLIC_BACK_API_HOST=dev3.4nkweb.com NEXT_PUBLIC_BACK_API_PORT=443 diff --git a/.env.master.bak_1758718255 b/.env.master.bak_1758718255 new file mode 100644 index 0000000..67c4c9a --- /dev/null +++ b/.env.master.bak_1758718255 @@ -0,0 +1,172 @@ +# DOMAIN +DOMAIN=dev4.4nkweb.com +BOOTSTRAP_DOMAIN=dev3.4nkweb.com +LOCAL_DOMAIN=local.4nkweb.com +LECOFFRE_BACK_DOMAIN=dev3.4nkweb.com + +# GIT +GITEA_BASE_URL=git.4nkweb.com +GIT_TOKEN=8cde80690a5ffd737536d82a1ab16a765d5105df +GITEA_OWNER="nicolas.cantu,Omar" +GITEA_RUNNER_NAME=debian-runner + +# Variables d'environnement pour l'application back-end +NODE_ENV=production +RUST_LOG=DEBUG +NODE_OPTIONS=--max-old-space-size=2048 + +# Configuration serveur +APP_HOST=dev4.4nkweb.com +API_BASE_URL=https://dev3.4nkweb.com/back +DEFAULT_STORAGE=https://dev4.4nkweb.com/storage + +# Variables d'environnement pour l'application front-end +# IHM URLS +VITE_BOOTSTRAPURL=wss://dev3.4nkweb.com/ws/ + +# Cartes de test Stripe +SUCCES='4242 4242 4242 4242' +DECLINED='4000 0025 0000 3155' +CORS_ALLOWED_ORIGINS=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 + +# ================== /!\ sensible ========================= + +# Configuration IDNOT + +VITE_JWT_SECRET_KEY=52b3d77617bb00982dfee15b08effd52cfe5b2e69b2f61cc4848cfe1e98c0bc9 + +# Configuration pour réduire les traces Docker +DOCKER_LOG_LEVEL=info +COMPOSE_LOG_LEVEL=WARNING + +# =========================================== +# VARIABLES(manquantes) +# =========================================== +SIGNER_WS_URL=ws://dev3.4nkweb.com:9090 +SIGNER_BASE_URL=https://dev3.4nkweb.com +SIGNER_API_KEY=your-api-key-change-this +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) +# =========================================== +RELAY_URLS=wss://dev4.4nkweb.com/ws/,wss://dev3.4nkweb.com/ws/ +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_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 +SDK_RELAY_BLINDBIT_URL=http://blindbit-oracle:8000 + +# =========================================== +# VARIABLES IHM_CLIENT (formatées pour docker-compose) +# =========================================== +VITE_API_BASE_URL=https://dev3.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://dev3.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 + +# =========================================== +# GRAFANA +# =========================================== +GF_SECURITY_ADMIN_PASSWORD=Fuy8ZfxQI2xdSdoB8wsGxNjyU +GF_USERS_ALLOW_SIGN_UP=false +GF_SERVER_ROOT_URL=https://dev4.4nkweb.com/grafana/ +GF_PLUGINS_PREINSTALL_SYNC=grafana-clock-panel,grafana-simple-json-datasource + +# Frontend runtime +NODE_OPTIONS=--max-old-space-size=4096 +NODE_ENV=production + +# Public URLs +NEXT_PUBLIC_4NK_IFRAME_URL=https://dev4.4nkweb.com + + +# Back base for state endpoint (dev3) +NEXT_PUBLIC_BACK_BASE=https://dev3.4nkweb.com + +OVH_APP_KEY=5ab0709bbb65ef26 +OVH_APP_SECRET=de1fac1779d707d263a611a557cd5766 +OVH_CONSUMER_KEY=5fe817829b8a9c780cfa2354f8312ece +OVH_SMS_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_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 + +# Configuration back-end +IDNOT_CLIENT_ID=B3CE56353EDB15A9 +IDNOT_CLIENT_SECRET=3F733549E879878344B6C949B366BB5CDBB2DB5B7F7AB7EBBEBB0F0DD0776D1C +"IDNOT_REDIRECT_URI"=https://lecoffreio.4nkweb.com/authorized-client +IDNOT_TOKEN_URL=https://qual-connexion.idnot.fr/user/IdPOAuth2/token/idnot_idp_v1 +IDNOT_API_BASE_URL=https://qual-api.notaires + +# Configuration front-end + +NEXT_PUBLIC_IDNOT_REDIRECT_URI_FIXED=https://lecoffreio.4nkweb.com/authorized-client +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_IDNOT_CLIENT_ID=B3CE56353EDB15A9 +NEXT_PUBLIC_BACK_API_PROTOCOL=https +NEXT_PUBLIC_BACK_API_HOST=dev3.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 +NEXT_PUBLIC_TARGET_ORIGIN=https://dev4.4nkweb.com/lecoffre +NEXT_PUBLIC_IDNOT_REDIRECT_URI=https://lecoffreio.4nkweb.com/authorized-client +NEXT_PUBLIC_DOCAPOSTE_API_URL= +NEXT_PUBLIC_API_URL=https://dev3.4nkweb.com/api +NEXT_PUBLIC_DEFAULT_VALIDATOR_ID=28c9a3a8151bef545ebf700ca5222c63d0031ad593097e95c1de202464304a99 +NEXT_PUBLIC_DEFAULT_STORAGE_URLS=https://dev4.4nkweb.com/storage + +BACK_API_ROOT_URL=/api +BACK_API_VERSION=/v1 + +# Configuration idnot +IDNOT_ANNUARY_BASE_URL='https://qual-api.notaires.fr/annuaire' +IDNOT_API_KEY='ba557f84-0bf6-4dbf-844f-df2767555e3e' diff --git a/.env.master.bak_1758718268 b/.env.master.bak_1758718268 new file mode 100644 index 0000000..67c4c9a --- /dev/null +++ b/.env.master.bak_1758718268 @@ -0,0 +1,172 @@ +# DOMAIN +DOMAIN=dev4.4nkweb.com +BOOTSTRAP_DOMAIN=dev3.4nkweb.com +LOCAL_DOMAIN=local.4nkweb.com +LECOFFRE_BACK_DOMAIN=dev3.4nkweb.com + +# GIT +GITEA_BASE_URL=git.4nkweb.com +GIT_TOKEN=8cde80690a5ffd737536d82a1ab16a765d5105df +GITEA_OWNER="nicolas.cantu,Omar" +GITEA_RUNNER_NAME=debian-runner + +# Variables d'environnement pour l'application back-end +NODE_ENV=production +RUST_LOG=DEBUG +NODE_OPTIONS=--max-old-space-size=2048 + +# Configuration serveur +APP_HOST=dev4.4nkweb.com +API_BASE_URL=https://dev3.4nkweb.com/back +DEFAULT_STORAGE=https://dev4.4nkweb.com/storage + +# Variables d'environnement pour l'application front-end +# IHM URLS +VITE_BOOTSTRAPURL=wss://dev3.4nkweb.com/ws/ + +# Cartes de test Stripe +SUCCES='4242 4242 4242 4242' +DECLINED='4000 0025 0000 3155' +CORS_ALLOWED_ORIGINS=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 + +# ================== /!\ sensible ========================= + +# Configuration IDNOT + +VITE_JWT_SECRET_KEY=52b3d77617bb00982dfee15b08effd52cfe5b2e69b2f61cc4848cfe1e98c0bc9 + +# Configuration pour réduire les traces Docker +DOCKER_LOG_LEVEL=info +COMPOSE_LOG_LEVEL=WARNING + +# =========================================== +# VARIABLES(manquantes) +# =========================================== +SIGNER_WS_URL=ws://dev3.4nkweb.com:9090 +SIGNER_BASE_URL=https://dev3.4nkweb.com +SIGNER_API_KEY=your-api-key-change-this +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) +# =========================================== +RELAY_URLS=wss://dev4.4nkweb.com/ws/,wss://dev3.4nkweb.com/ws/ +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_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 +SDK_RELAY_BLINDBIT_URL=http://blindbit-oracle:8000 + +# =========================================== +# VARIABLES IHM_CLIENT (formatées pour docker-compose) +# =========================================== +VITE_API_BASE_URL=https://dev3.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://dev3.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 + +# =========================================== +# GRAFANA +# =========================================== +GF_SECURITY_ADMIN_PASSWORD=Fuy8ZfxQI2xdSdoB8wsGxNjyU +GF_USERS_ALLOW_SIGN_UP=false +GF_SERVER_ROOT_URL=https://dev4.4nkweb.com/grafana/ +GF_PLUGINS_PREINSTALL_SYNC=grafana-clock-panel,grafana-simple-json-datasource + +# Frontend runtime +NODE_OPTIONS=--max-old-space-size=4096 +NODE_ENV=production + +# Public URLs +NEXT_PUBLIC_4NK_IFRAME_URL=https://dev4.4nkweb.com + + +# Back base for state endpoint (dev3) +NEXT_PUBLIC_BACK_BASE=https://dev3.4nkweb.com + +OVH_APP_KEY=5ab0709bbb65ef26 +OVH_APP_SECRET=de1fac1779d707d263a611a557cd5766 +OVH_CONSUMER_KEY=5fe817829b8a9c780cfa2354f8312ece +OVH_SMS_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_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 + +# Configuration back-end +IDNOT_CLIENT_ID=B3CE56353EDB15A9 +IDNOT_CLIENT_SECRET=3F733549E879878344B6C949B366BB5CDBB2DB5B7F7AB7EBBEBB0F0DD0776D1C +"IDNOT_REDIRECT_URI"=https://lecoffreio.4nkweb.com/authorized-client +IDNOT_TOKEN_URL=https://qual-connexion.idnot.fr/user/IdPOAuth2/token/idnot_idp_v1 +IDNOT_API_BASE_URL=https://qual-api.notaires + +# Configuration front-end + +NEXT_PUBLIC_IDNOT_REDIRECT_URI_FIXED=https://lecoffreio.4nkweb.com/authorized-client +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_IDNOT_CLIENT_ID=B3CE56353EDB15A9 +NEXT_PUBLIC_BACK_API_PROTOCOL=https +NEXT_PUBLIC_BACK_API_HOST=dev3.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 +NEXT_PUBLIC_TARGET_ORIGIN=https://dev4.4nkweb.com/lecoffre +NEXT_PUBLIC_IDNOT_REDIRECT_URI=https://lecoffreio.4nkweb.com/authorized-client +NEXT_PUBLIC_DOCAPOSTE_API_URL= +NEXT_PUBLIC_API_URL=https://dev3.4nkweb.com/api +NEXT_PUBLIC_DEFAULT_VALIDATOR_ID=28c9a3a8151bef545ebf700ca5222c63d0031ad593097e95c1de202464304a99 +NEXT_PUBLIC_DEFAULT_STORAGE_URLS=https://dev4.4nkweb.com/storage + +BACK_API_ROOT_URL=/api +BACK_API_VERSION=/v1 + +# Configuration idnot +IDNOT_ANNUARY_BASE_URL='https://qual-api.notaires.fr/annuaire' +IDNOT_API_KEY='ba557f84-0bf6-4dbf-844f-df2767555e3e' diff --git a/.env.master.bak_20250922162546 b/.env.master.bak_20250922162546 index 0cc406b..8aae51d 100644 --- a/.env.master.bak_20250922162546 +++ b/.env.master.bak_20250922162546 @@ -1,7 +1,7 @@ # DOMAIN DOMAIN=dev4.4nkweb.com BOOTSTRAP_DOMAIN=dev3.4nkweb.com -LOCAL_DOMAIN=lecoffreio.4nkweb.com +LOCAL_DOMAIN=local.4nkweb.com LECOFFRE_BACK_DOMAIN=dev3.4nkweb.com # GIT @@ -15,50 +15,19 @@ NODE_ENV=production RUST_LOG=DEBUG NODE_OPTIONS=--max-old-space-size=2048 -# Configuration IDNOT -IDNOT_ANNUARY_BASE_URL=https://qual-api.notaires.fr/annuaire -IDNOT_REDIRECT_URI=https:///lecoffre/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://${DOMAIN}/back -DEFAULT_STORAGE=https://${DOMAIN}/storage +API_BASE_URL=https://dev3.4nkweb.com/back +DEFAULT_STORAGE=https://dev4.4nkweb.com/storage # Variables d'environnement pour l'application front-end -NEXT_PUBLIC_4NK_URL=https://${DOMAIN} -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=${LECOFFRE_BACK_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=28c9a3a8151bef545ebf700ca5222c63d0031ad593097e95c1de202464304a99 -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/ +VITE_BOOTSTRAPURL=wss://dev3.4nkweb.com/ws/ # Cartes de test Stripe SUCCES='4242 4242 4242 4242' DECLINED='4000 0025 0000 3155' -CORS_ALLOWED_ORIGINS=https://${DOMAIN} +CORS_ALLOWED_ORIGINS=https://dev4.4nkweb.com core_url=http://bitcoin:38332 ws_url=0.0.0.0:8090 @@ -66,21 +35,16 @@ wallet_name=default network=signet blindbit_url=http://blindbit:8000 zmq_url=tcp://bitcoin:29000 -storage=https://${DOMAIN}/storage +storage=https://dev4.4nkweb.com/storage data_dir=/home/bitcoin/.4nk bitcoin_data_dir=/home/bitcoin/.bitcoin -bootstrap_url=wss://${BOOTSTRAP_DOMAIN}/ws/ +bootstrap_url=wss://dev3.4nkweb.com/ws/ bootstrap_faucet=true # ================== /!\ 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 -SIGNER_API_KEY=your-api-key-change-this VITE_JWT_SECRET_KEY=52b3d77617bb00982dfee15b08effd52cfe5b2e69b2f61cc4848cfe1e98c0bc9 # Configuration pour réduire les traces Docker @@ -90,9 +54,12 @@ COMPOSE_LOG_LEVEL=WARNING # =========================================== # VARIABLES(manquantes) # =========================================== +SIGNER_WS_URL=ws://dev3.4nkweb.com:9090 +SIGNER_BASE_URL=https://dev3.4nkweb.com +SIGNER_API_KEY=your-api-key-change-this SIGNER_PORT=9090 SIGNER_DATABASE_PATH=./data/server.db -SIGNER_RELAY_URLS=wss://${DOMAIN}/ws/,wss://${BOOTSTRAP_DOMAIN}/ws/ +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 @@ -100,26 +67,26 @@ SIGNER_LOG_LEVEL=info # =========================================== # VARIABLES SDK_RELAY (formatées pour docker-compose) # =========================================== +RELAY_URLS=wss://dev4.4nkweb.com/ws/,wss://dev3.4nkweb.com/ws/ 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_ZMQ_URL=tcp://bitcoin:29000 -SDK_RELAY_STORAGE=https://${DOMAIN}/storage +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://${BOOTSTRAP_DOMAIN}/ws/ +SDK_RELAY_BOOTSTRAP_URL=wss://dev3.4nkweb.com/ws/ SDK_RELAY_BOOTSTRAP_FAUCET=true SDK_RELAY_BLINDBIT_URL=http://blindbit-oracle:8000 - # =========================================== # 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 +VITE_API_BASE_URL=https://dev3.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://dev3.4nkweb.com/signer # =========================================== # VARIABLES MONITORING @@ -135,4 +102,71 @@ PROMTAIL_CONFIG_FILE=/etc/promtail/config.yml GF_SECURITY_ADMIN_PASSWORD=Fuy8ZfxQI2xdSdoB8wsGxNjyU GF_USERS_ALLOW_SIGN_UP=false GF_SERVER_ROOT_URL=https://dev4.4nkweb.com/grafana/ -GF_PLUGINS_PREINSTALL_SYNC=grafana-clock-panel,grafana-simple-json-datasource \ No newline at end of file +GF_PLUGINS_PREINSTALL_SYNC=grafana-clock-panel,grafana-simple-json-datasource + +# Frontend runtime +NODE_OPTIONS=--max-old-space-size=4096 +NODE_ENV=production + +# Public URLs +NEXT_PUBLIC_4NK_IFRAME_URL=https://dev4.4nkweb.com + + +# Back base for state endpoint (dev3) +NEXT_PUBLIC_BACK_BASE=https://dev3.4nkweb.com + +OVH_APP_KEY=5ab0709bbb65ef26 +OVH_APP_SECRET=de1fac1779d707d263a611a557cd5766 +OVH_CONSUMER_KEY=5fe817829b8a9c780cfa2354f8312ece +OVH_SMS_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_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 + +# Configuration back-end +IDNOT_CLIENT_ID=B3CE56353EDB15A9 +IDNOT_CLIENT_SECRET=3F733549E879878344B6C949B366BB5CDBB2DB5B7F7AB7EBBEBB0F0DD0776D1C +IDNOT_REDIRECT_URI=https://lecoffreio.4nkweb.com/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 front-end + +NEXT_PUBLIC_IDNOT_REDIRECT_URI_FIXED=https://lecoffreio.4nkweb.com/authorized-client +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_IDNOT_CLIENT_ID=B3CE56353EDB15A9 +NEXT_PUBLIC_BACK_API_PROTOCOL=https +NEXT_PUBLIC_BACK_API_HOST=dev3.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 +NEXT_PUBLIC_TARGET_ORIGIN=https://dev4.4nkweb.com/lecoffre +NEXT_PUBLIC_IDNOT_REDIRECT_URI=https://lecoffreio.4nkweb.com/authorized-client +NEXT_PUBLIC_DOCAPOSTE_API_URL= +NEXT_PUBLIC_API_URL=https://dev3.4nkweb.com/api +NEXT_PUBLIC_DEFAULT_VALIDATOR_ID=28c9a3a8151bef545ebf700ca5222c63d0031ad593097e95c1de202464304a99 +NEXT_PUBLIC_DEFAULT_STORAGE_URLS=https://dev4.4nkweb.com/storage + +BACK_API_ROOT_URL=/api +BACK_API_VERSION=/v1 + +# Configuration idnot +IDNOT_ANNUARY_BASE_URL='https://qual-api.notaires.fr/annuaire' +IDNOT_API_KEY='ba557f84-0bf6-4dbf-844f-df2767555e3e' diff --git a/docker-compose.yml b/docker-compose.yml index 6550416..861bad7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -175,30 +175,7 @@ services: # restart: unless-stopped lecoffre-front: - build: - context: ../lecoffre-front - dockerfile: Dockerfile - args: - - NEXT_PUBLIC_4NK_URL - - NEXT_PUBLIC_FRONT_APP_HOST - - NEXT_PUBLIC_IDNOT_BASE_URL - - NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT - - NEXT_PUBLIC_BACK_API_PROTOCOL - - NEXT_PUBLIC_BACK_API_HOST - - NEXT_PUBLIC_BACK_API_PORT - - NEXT_PUBLIC_BACK_API_ROOT_URL - - NEXT_PUBLIC_BACK_API_VERSION - - NEXT_PUBLIC_ANK_BASE_REDIRECT_URI - - NEXT_PUBLIC_TARGET_ORIGIN - - NEXT_PUBLIC_4NK_IFRAME_URL - - NEXT_PUBLIC_IDNOT_REDIRECT_URI - - NEXT_PUBLIC_DOCAPOSTE_API_URL - - NEXT_PUBLIC_API_URL - - NEXT_PUBLIC_DEFAULT_VALIDATOR_ID - - NEXT_PUBLIC_DEFAULT_STORAGE_URLS - - NEXT_PUBLIC_IDNOT_CLIENT_ID - - NEXT_PUBLIC_IDNOT_REDIRECT_URI_FIXED - - NEXT_PUBLIC_BACK_BASE + image: git.4nkweb.com/4nk/lecoffre-front:ext container_name: lecoffre-front working_dir: /leCoffre-front env_file: @@ -221,7 +198,6 @@ services: sdk_signer: condition: service_healthy user: lecoffreuser - command: ["node", "server.js"] healthcheck: test: ["CMD", "sh", "-c", "if ps aux | grep -v grep | grep next-server >/dev/null 2>&1; then echo 'LeCoffre Frontend ready: Next.js server running'; exit 0; else echo 'LeCoffre Frontend starting: Next.js server not yet ready'; exit 1; fi"] interval: 30s