fix(insports merge): change configs for insports

keep-around/b214ac7012ef42593bee62c207888a2593bc5a38
Andrei Dekterev 3 years ago
parent e2d78875a7
commit 356913d556
  1. 2
      .drone.yml
  2. 12
      Makefile
  3. 21
      src/config/matomo.tsx

@ -33,7 +33,7 @@ steps:
commands: commands:
- apk add --no-cache aws-cli bash git openssh-client make rsync - apk add --no-cache aws-cli bash git openssh-client make rsync
- npm install --legacy-peer-deps - npm install --legacy-peer-deps
- npm run build - npm prod
- aws s3 sync build s3://instat-frontend-test-a --delete - aws s3 sync build s3://instat-frontend-test-a --delete
- aws cloudfront create-invalidation --distribution-id E1WZHVCHZ48SG6 --paths "/*" - aws cloudfront create-invalidation --distribution-id E1WZHVCHZ48SG6 --paths "/*"
- make auth-build - make auth-build

@ -49,7 +49,7 @@ build-d: clean
REACT_APP_CLIENT=insports \ REACT_APP_CLIENT=insports \
REACT_APP_STAGE=d-staging \ REACT_APP_STAGE=d-staging \
npm run build npm run build
build-e: clean build-e: clean
REACT_APP_TYPE=ott \ REACT_APP_TYPE=ott \
REACT_APP_ENV=staging \ REACT_APP_ENV=staging \
@ -70,14 +70,14 @@ build-g: clean
REACT_APP_CLIENT=insports \ REACT_APP_CLIENT=insports \
REACT_APP_STAGE=g-staging \ REACT_APP_STAGE=g-staging \
npm run build npm run build
build-h: clean build-h: clean
REACT_APP_TYPE=ott \ REACT_APP_TYPE=ott \
REACT_APP_ENV=staging \ REACT_APP_ENV=staging \
REACT_APP_CLIENT=insports \ REACT_APP_CLIENT=insports \
REACT_APP_STAGE=h-staging \ REACT_APP_STAGE=h-staging \
npm run build npm run build
build-i: clean build-i: clean
REACT_APP_TYPE=ott \ REACT_APP_TYPE=ott \
REACT_APP_ENV=staging \ REACT_APP_ENV=staging \
@ -128,9 +128,9 @@ prod: clean
REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW7v2lF8GGogrm7XaaICZ9CN876sITIBBauZgB2ommUTUOiY868jzpbhQjZcoBOjIRX5Vs54Aq00y4C3USyB \ REACT_APP_STRIPE_PK=pk_live_51J5TEYEDSxVnTgDW7v2lF8GGogrm7XaaICZ9CN876sITIBBauZgB2ommUTUOiY868jzpbhQjZcoBOjIRX5Vs54Aq00y4C3USyB \
npm run build npm run build
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/wwwroot/ # rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@de.instat.tv:/usr/local/www/ott/wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/wwwroot/ # rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@fr.instat.tv:/usr/local/www/ott/wwwroot/
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@137.74.33.74:/usr/local/www/ott/wwwroot/ # rsync -zavP --delete-before build/ -e 'ssh -p 666' ott@137.74.33.74:/usr/local/www/ott/wwwroot/
preprod: clean preprod: clean
REACT_APP_TYPE=ott \ REACT_APP_TYPE=ott \

@ -9,19 +9,14 @@ const getMatomoInstance = () => {
urlBase: 'link.to.domain', urlBase: 'link.to.domain',
} }
// switch (process.env.REACT_APP_CLIENT) { switch (process.env.REACT_APP_CLIENT) {
// case 'instat': case 'insports':
// matomoInstance = { matomoInstance = {
// ...matomoInstance, ...matomoInstance,
// siteId: 1, siteId: 1,
// urlBase: PAGES.matomoInstatBaseUrl, urlBase: PAGES.matomoInstatBaseUrl,
// } }
// break break
// }
matomoInstance = {
...matomoInstance,
siteId: 1,
urlBase: PAGES.matomoInstatBaseUrl,
} }
return createInstance(matomoInstance) return createInstance(matomoInstance)

Loading…
Cancel
Save