From 6f6531428af372c5deab8e0c6dff02bc2ff3c3f1 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 7 Aug 2020 17:00:57 -0700 Subject: [PATCH 1/4] fix(deploy): Updating deploy script --- deploy-production.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy-production.sh b/deploy-production.sh index 6064898..b6fd060 100755 --- a/deploy-production.sh +++ b/deploy-production.sh @@ -11,5 +11,7 @@ export DATA="{\"ref\":\"$DEPLOY_SECRET\"}" curl -X POST http://fullstack.cash:9000/hooks/bch-api-mainnet -H "Content-Type: application/json" -d $DATA curl -X POST http://fullstack.cash:9000/hooks/bch-api-testnet -H "Content-Type: application/json" -d $DATA +curl -X POST http://$FREE_SERVER:9000/hooks/bch-api-testnet -H "Content-Type: application/json" -d $DATA +curl -X POST http://$FREE_SERVER:9000/hooks/bch-api-mainnet -H "Content-Type: application/json" -d $DATA echo "...Finished deploying to production." From b7f1eba6bde89ac8cb666fe22eeb25f72ccd5971 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 7 Aug 2020 17:15:00 -0700 Subject: [PATCH 2/4] fix(deploy): Testing deploy again --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index a2e90e3..b24e888 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # bch-api -[![Greenkeeper badge](https://badges.greenkeeper.io/christroutner/bch-api.svg)](https://greenkeeper.io/) [![Build Status](https://travis-ci.org/christroutner/bch-api.svg?branch=master)](https://travis-ci.org/christroutner/bch-api) From 584037ebdd726399b9646717017c9ae2442ad615 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Sat, 8 Aug 2020 08:22:23 -0700 Subject: [PATCH 3/4] fix(origin): Tracking origin of requests in logs --- src/middleware/route-ratelimit.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/middleware/route-ratelimit.js b/src/middleware/route-ratelimit.js index 40a0fb9..1da6f18 100644 --- a/src/middleware/route-ratelimit.js +++ b/src/middleware/route-ratelimit.js @@ -119,6 +119,7 @@ class RateLimits { // If the request originates from one of the approved wallet apps, then // apply paid-access rate limits. const origin = req.get('origin') + wlogger.info(`origin: ${origin}`) if ( origin && (origin.toString().indexOf('wallet.fullstack.cash') > -1 || From 98e1a5b40ffdfc185f7d8f30994e094504ce6659 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Sat, 8 Aug 2020 09:32:36 -0700 Subject: [PATCH 4/4] fix(Docker): Updating dockerfile to PSF repo --- docker/mainnet/Dockerfile | 2 +- docker/testnet/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/mainnet/Dockerfile b/docker/mainnet/Dockerfile index 43c7e45..0df3a30 100644 --- a/docker/mainnet/Dockerfile +++ b/docker/mainnet/Dockerfile @@ -16,7 +16,7 @@ USER safeuser # Clone the repository WORKDIR /home/safeuser -RUN git clone https://github.com/christroutner/bch-api +RUN git clone https://github.com/Permissionless-Software-Foundation/bch-api WORKDIR /home/safeuser/bch-api RUN npm install diff --git a/docker/testnet/Dockerfile b/docker/testnet/Dockerfile index 253f9cf..46dafb7 100644 --- a/docker/testnet/Dockerfile +++ b/docker/testnet/Dockerfile @@ -13,7 +13,7 @@ USER safeuser # Clone the repository WORKDIR /home/safeuser -RUN git clone https://github.com/christroutner/bch-api +RUN git clone https://github.com/Permissionless-Software-Foundation/bch-api WORKDIR /home/safeuser/bch-api RUN npm install