From 05098b1141ad1f5cf4df1caf64778f3880d07386 Mon Sep 17 00:00:00 2001 From: bguillaumat Date: Thu, 25 Feb 2021 10:33:04 +0100 Subject: [PATCH] Update docker mempool-config --- docker/README.md | 2 +- docker/backend/mempool-config.json | 6 +++--- docker/backend/start.sh | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docker/README.md b/docker/README.md index fa8f44bb2..45c2faf46 100644 --- a/docker/README.md +++ b/docker/README.md @@ -66,7 +66,7 @@ services: MYSQL_USER: "mempool" MYSQL_PASS: "mempool" BACKEND_MAINNET_HTTP_PORT: "8999" - CACHE_DIR: "/backend/cache/" + CACHE_DIR: "/backend/cache" db: image: mariadb:10.5.8 user: "1000:1000" diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 7f3ae6729..5ebe00e8d 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -6,7 +6,8 @@ "SPAWN_CLUSTER_PROCS": 0, "API_URL_PREFIX": "/api/v1/", "POLL_RATE_MS": 2000, - "CACHE_DIR": "__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__" + "CACHE_DIR": "__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__", + "CLEAR_PROTECTION_MINUTES": __MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__ }, "CORE_RPC": { "HOST": "__BITCOIN_MAINNET_RPC_HOST__", @@ -17,8 +18,7 @@ "ELECTRUM": { "HOST": "__ELECTRS_MAINNET_HTTP_HOST__", "PORT": __ELECTRS_MAINNET_HTTP_PORT__, - "TLS_ENABLED": false, - "TX_LOOKUPS": true + "TLS_ENABLED": __ELECTRS_MAINNET_TLS_ENABLED__ }, "ESPLORA": { "REST_API_URL": "http://127.0.0.1:3000" diff --git a/docker/backend/start.sh b/docker/backend/start.sh index 6b01c2632..a0b20402c 100644 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -2,7 +2,8 @@ #MEMPOOL __MEMPOOL_BACKEND_MAINNET_HTTP_PORT__=${BACKEND_MAINNET_HTTP_PORT:=8999} -__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__=${CACHE_DIR:=./} +__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__=${CACHE_DIR:=./cache} +__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__=${MEMPOOL_CLEAR_PROTECTION_MINUTES:=20} # BITCOIN __BITCOIN_MAINNET_RPC_HOST__=${RPC_HOST:=127.0.0.1} __BITCOIN_MAINNET_RPC_PORT__=${RPC_PORT:=8332} @@ -11,6 +12,7 @@ __BITCOIN_MAINNET_RPC_PASS__=${RPC_PASS:=mempool} # ELECTRUM __ELECTRS_MAINNET_HTTP_HOST__=${ELECTRS_HOST:=127.0.0.1} __ELECTRS_MAINNET_HTTP_PORT__=${ELECTRS_PORT:=50002} +__ELECTRS_MAINNET_TLS_ENABLED__=${ELECTRS_TLS:=false} # MYSQL __MYSQL_HOST__=${MYSQL_HOST:=127.0.0.1} __MYSQL_PORT__=${MYSQL_PORT:=3306} @@ -26,6 +28,7 @@ sed -i "s/__BITCOIN_MAINNET_RPC_USER__/${__BITCOIN_MAINNET_RPC_USER__}/g" mempoo sed -i "s/__BITCOIN_MAINNET_RPC_PASS__/${__BITCOIN_MAINNET_RPC_PASS__}/g" mempool-config.json sed -i "s/__ELECTRS_MAINNET_HTTP_HOST__/${__ELECTRS_MAINNET_HTTP_HOST__}/g" mempool-config.json sed -i "s/__ELECTRS_MAINNET_HTTP_PORT__/${__ELECTRS_MAINNET_HTTP_PORT__}/g" mempool-config.json +sed -i "s/__ELECTRS_MAINNET_TLS_ENABLED__/${__ELECTRS_MAINNET_TLS_ENABLED__}/g" mempool-config.json sed -i "s/__MYSQL_HOST__/${__MYSQL_HOST__}/g" mempool-config.json sed -i "s/__MYSQL_PORT__/${__MYSQL_PORT__}/g" mempool-config.json sed -i "s/__MYSQL_DATABASE__/${__MYSQL_DATABASE__}/g" mempool-config.json @@ -33,5 +36,6 @@ sed -i "s/__MYSQL_USERNAME__/${__MYSQL_USERNAME__}/g" mempool-config.json sed -i "s/__MYSQL_PASSWORD__/${__MYSQL_PASSWORD__}/g" mempool-config.json sed -i "s!__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__!${__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__}!g" mempool-config.json sed -i "s/__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__/${__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__}/g" mempool-config.json +sed -i "s/__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__/${__MEMPOOL_BACKEND_CLEAR_PROTECTION_MINUTES__}/g" mempool-config.json node /backend/dist/index.js