diff --git a/.github/main.workflow b/.github/main.workflow index 70add161..f888c8c3 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -63,12 +63,6 @@ action "Build front image" { needs = ["Login to Docker"] } -action "Build proxy image" { - uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" - args = "build -t igorkamyshev/checkmoney-proxy -f Dockerfile-proxy ." - needs = ["Login to Docker"] -} - action "Push back image" { uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" args = "push igorkamyshev/checkmoney-back" @@ -81,15 +75,9 @@ action "Push front image" { needs = ["Build front image"] } -action "Push proxy image" { - uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" - args = "push igorkamyshev/checkmoney-proxy" - needs = ["Build proxy image"] -} - action "Deploy on server" { uses = "maddox/actions/ssh@master" - needs = ["Push front image", "Push back image", "Push proxy image"] + needs = ["Push front image", "Push back image"] args = "cd /root/web/checkmoney && docker-compose pull && docker-compose down && docker-compose up -d && docker-compose run back yarn evolutions:run && docker image prune -f" secrets = ["HOST", "USER", "PUBLIC_KEY", "PRIVATE_KEY"] } diff --git a/Dockerfile-proxy b/Dockerfile-proxy deleted file mode 100644 index df01486f..00000000 --- a/Dockerfile-proxy +++ /dev/null @@ -1,15 +0,0 @@ -FROM keymetrics/pm2:10-alpine - -RUN echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories -RUN apk add --no-cache yarn git - -WORKDIR /app - -COPY . . - -WORKDIR /app/proxy -RUN yarn - -EXPOSE 8000 - -CMD [ "pm2-docker", "start", "pm2.config.js" ] \ No newline at end of file diff --git a/back/src/addons/setupTelegram.ts b/back/src/addons/setupTelegram.ts index 5d8445a9..7b5815ee 100644 --- a/back/src/addons/setupTelegram.ts +++ b/back/src/addons/setupTelegram.ts @@ -7,7 +7,9 @@ export const setupTelegram = (app: INestApplication) => { const bot = app.get(TelegramBot) const config = app.get(Configuration) - if (config.isProd()) { + const isMirror = config.getBooleanOrElse('IS_MIRROR', false) + + if (config.isProd() && !isMirror) { app.use( bot.getMiddleware(config.getStringOrElse('APP_SECRET', 'secret-path')), ) diff --git a/proxy/index.js b/proxy/index.js deleted file mode 100644 index 2754c14d..00000000 --- a/proxy/index.js +++ /dev/null @@ -1,12 +0,0 @@ -const httpProxy = require('http-proxy') - -const UPSTREAM = process.env.BACK_URL || 'https://api.checkmoney.space' - -httpProxy - .createProxyServer({ - changeOrigin: true, - target: UPSTREAM, - followRedirects: true, - }) - .on('error', e => console.log(JSON.stringify(e, null, ' '))) - .listen(8000) diff --git a/proxy/package.json b/proxy/package.json deleted file mode 100644 index 361f29f3..00000000 --- a/proxy/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "checkmoney-proxy", - "version": "1.0.0", - "main": "index.js", - "license": "MIT", - "scripts": { - "start:proxy:prod": "pm2 start ./pm2.config.js" - }, - "dependencies": { - "http-proxy": "^1.17.0" - } -} diff --git a/proxy/pm2.config.js b/proxy/pm2.config.js deleted file mode 100644 index fd98de5c..00000000 --- a/proxy/pm2.config.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - apps: [ - { - name: 'checkmoney-proxy', - script: 'index.js', - watch: false, - instances: 'max', - exec_mode: 'cluster', - merge_logs: true, - env_production: { NODE_ENV: 'production' }, - }, - ], -} diff --git a/proxy/yarn.lock b/proxy/yarn.lock deleted file mode 100644 index ae709362..00000000 --- a/proxy/yarn.lock +++ /dev/null @@ -1,41 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -debug@^3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== - dependencies: - ms "^2.1.1" - -eventemitter3@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" - integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA== - -follow-redirects@^1.0.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76" - integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ== - dependencies: - debug "^3.2.6" - -http-proxy@^1.17.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a" - integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g== - dependencies: - eventemitter3 "^3.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - -ms@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=