Apply Wiz suggestions

Co-authored-by: wiz <j@wiz.biz>
This commit is contained in:
Bastien Guillaumat 2021-02-02 16:34:21 +01:00 committed by GitHub
parent c26737ffd6
commit 6efe055003
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 33 deletions

View file

@ -2,21 +2,21 @@
"MEMPOOL": { "MEMPOOL": {
"NETWORK": "mainnet", "NETWORK": "mainnet",
"BACKEND": "electrum", "BACKEND": "electrum",
"HTTP_PORT": 8999, "HTTP_PORT": __MEMPOOL_BACKEND_MAINNET_HTTP_PORT__,
"SPAWN_CLUSTER_PROCS": 0, "SPAWN_CLUSTER_PROCS": 0,
"API_URL_PREFIX": "/api/v1/", "API_URL_PREFIX": "/api/v1/",
"POLL_RATE_MS": 2000, "POLL_RATE_MS": 2000,
"CACHE_DIR": "<CACHE_DIR>" "CACHE_DIR": "__MEMPOOL_BACKEND_MAINNET_CACHE_DIR__"
}, },
"CORE_RPC": { "CORE_RPC": {
"HOST": "<RPC_HOST>", "HOST": "__BITCOIN_MAINNET_RPC_HOST__",
"PORT": <RPC_PORT>, "PORT": __BITCOIN_MAINNET_RPC_PORT__,
"USERNAME": "<RPC_USER>", "USERNAME": "__BITCOIN_MAINNET_RPC_USER__",
"PASSWORD": "<RPC_PASS>" "PASSWORD": "__BITCOIN_MAINNET_RPC_PASS__"
}, },
"ELECTRUM": { "ELECTRUM": {
"HOST": "<ELECTRS_HOST>", "HOST": "__ELECTRS_MAINNET_HTTP_HOST__",
"PORT": <ELECTRS_PORT>, "PORT": __ELECTRS_MAINNET_HTTP_PORT__,
"TLS_ENABLED": false, "TLS_ENABLED": false,
"TX_LOOKUPS": true "TX_LOOKUPS": true
}, },
@ -25,8 +25,8 @@
}, },
"DATABASE": { "DATABASE": {
"ENABLED": true, "ENABLED": true,
"HOST": "<MYSQL_HOST>", "HOST": "__MYSQL_HOST__",
"PORT": 3306, "PORT": __MYSQL_PORT__,
"DATABASE": "mempool", "DATABASE": "mempool",
"USERNAME": "mempool", "USERNAME": "mempool",
"PASSWORD": "mempool" "PASSWORD": "mempool"

View file

@ -1,21 +1,27 @@
#!/bin/sh #!/bin/sh
RPC_HOST=$RPC_HOST __BITCOIN_MAINNET_RPC_HOST__=${RPC_HOST}
RPC_PORT=$RPC_PORT __BITCOIN_MAINNET_RPC_PORT__=${RPC_PORT}
RPC_USER=$RPC_USER __BITCOIN_MAINNET_RPC_USER__=${RPC_USER}
RPC_PASS=$RPC_PASS __BITCOIN_MAINNET_RPC_PASS__=${RPC_PASS}
ELECTRS_HOST=$ELECTRS_HOST __ELECTRS_MAINNET_HTTP_HOST__=${ELECTRS_HOST}
ELECTRS_PORT=$ELECTRS_PORT __ELECTRS_MAINNET_HTTP_PORT__=${ELECTRS_PORT}
MYSQL_HOST=$MYSQL_HOST __MYSQL_HOST__=${MYSQL_HOST}
CACHE_DIR=$CACHE_DIR __MYSQL_PORT__=${MYSQL_PORT}
__MEMPOOL_BACKEND_CACHE_DIR__=${CACHE_DIR}
__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__=${BACKEND_MAINNET_HTTP_HOST}
__MEMPOOL_BACKEND_MAINNET_HTTP_PORT__=${BACKEND_MAINNET_HTTP_PORT}
sed -i "s/<RPC_HOST>/${RPC_HOST}/g" mempool-config.json sed -i "s/__BITCOIN_MAINNET_RPC_HOST__/${__BITCOIN_MAINNET_RPC_HOST__}/g" mempool-config.json
sed -i "s/<RPC_PORT>/${RPC_PORT}/g" mempool-config.json sed -i "s/__BITCOIN_MAINNET_RPC_PORT__/${__BITCOIN_MAINNET_RPC_PORT__}/g" mempool-config.json
sed -i "s/<RPC_USER>/${RPC_USER}/g" mempool-config.json sed -i "s/__BITCOIN_MAINNET_RPC_USER__/${__BITCOIN_MAINNET_RPC_USER__}/g" mempool-config.json
sed -i "s/<RPC_PASS>/${RPC_PASS}/g" mempool-config.json sed -i "s/__BITCOIN_MAINNET_RPC_PASS__/${__BITCOIN_MAINNET_RPC_PASS__}/g" mempool-config.json
sed -i "s/<ELECTRS_HOST>/${ELECTRS_HOST}/g" mempool-config.json sed -i "s/__ELECTRS_MAINNET_HTTP_HOST__/${__ELECTRS_MAINNET_HTTP_HOST__}/g" mempool-config.json
sed -i "s/<ELECTRS_PORT>/${ELECTRS_PORT}/g" mempool-config.json sed -i "s/__ELECTRS_MAINNET_HTTP_PORT__/${__ELECTRS_MAINNET_HTTP_PORT__}/g" mempool-config.json
sed -i "s/<MYSQL_HOST>/${MYSQL_HOST}/g" mempool-config.json sed -i "s/__MYSQL_HOST__/${__MYSQL_HOST__}/g" mempool-config.json
sed -i "s/<CACHE_DIR>/${CACHE_DIR}/g" mempool-config.json sed -i "s/__MYSQL_PORT__/${__MYSQL_PORT__}/g" mempool-config.json
sed -i "s/__MEMPOOL_BACKEND_CACHE_DIR__/${__MEMPOOL_BACKEND_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_MAINNET_HTTP_HOST__/${__MEMPOOL_BACKEND_MAINNET_HTTP_HOST_}/g" mempool-config.json
node /backend/dist/index.js node /backend/dist/index.js

View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
API_IP=$API_IP __MEMPOOL_BACKEND_MAINNET_HTTP_HOST__=${BACKEND_MAINNET_HTTP_HOST}
sed -i "s/<API_IP>/${API_IP}/g" /etc/nginx/conf.d/nginx-mempool.conf sed -i "s/__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__/${__MEMPOOL_BACKEND_MAINNET_HTTP_HOST__}/g" /etc/nginx/conf.d/nginx-mempool.conf
exec "$@" exec "$@"

View file

@ -7,15 +7,15 @@ cp ./docker/backend/* ./backend/
sed -i "s/${gitMaster}/master/g" ./backend/src/api/backend-info.ts sed -i "s/${gitMaster}/master/g" ./backend/src/api/backend-info.ts
#frontend #frontend
localIP="127.0.0.1" localhostIP="127.0.0.1"
cp ./docker/frontend/* ./frontend cp ./docker/frontend/* ./frontend
cp ./nginx.conf ./frontend/ cp ./nginx.conf ./frontend/
cp ./nginx-mempool.conf ./frontend/ cp ./nginx-mempool.conf ./frontend/
sed -i "s/${localIP}:/0.0.0.0:80/g" ./frontend/nginx.conf sed -i "s/${localhostIP}:/0.0.0.0:80/g" ./frontend/nginx.conf
sed -i "s/${localIP}/0.0.0.0/g" ./frontend/nginx.conf sed -i "s/${localhostIP}/0.0.0.0/g" ./frontend/nginx.conf
sed -i "s/user nobody;//g" ./frontend/nginx.conf sed -i "s/user nobody;//g" ./frontend/nginx.conf
sed -i "s/\/etc\/nginx\/nginx-mempool.conf/\/etc\/nginx\/conf.d\/nginx-mempool.conf/g" ./frontend/nginx.conf sed -i "s!/etc/nginx/nginx-mempool.conf!/etc/nginx/conf.d/nginx-mempool.conf!g" ./frontend/nginx.conf
sed -i "s/${localIP}:/<API_IP>:/g" ./frontend/nginx-mempool.conf sed -i "s/${localhostIP}:/__MEMPOOL_MAINNET_BACKEND_HOST__:/g" ./frontend/nginx-mempool.conf
#db #db
cp -fr docker/mysql . cp -fr docker/mysql .