Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test deploy #392

Merged
merged 4 commits into from
Sep 10, 2023
Merged

test deploy #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1301dba
test deploy
ADesBiysk Sep 10, 2023
bc3ef1d
test deploy
ADesBiysk Sep 10, 2023
e34b1ad
test deploy
ADesBiysk Sep 10, 2023
db467d4
Merge branch 'develop' into deploy/change_server
ADesBiysk Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy_prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Prod backend build and deploy
on:
pull_request:
branches:
- master
- develop
types: [ closed ]

env:
Expand All @@ -12,7 +12,7 @@ env:
IMAGE_NAME: lomaya_baryery_backend
DEPLOY_PATH: /lombarye/full
WORK_DIR: /LOMAYA_BARYERY_BACKEND
HEALTHCHECK_URL: https://lombaryery.tk/healthcheck
HEALTHCHECK_URL: https://бот.ломаябарьеры.рф/api/healthcheck

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
IMAGE_NAME_FRONT: lomaya_baryery_frontend
DEPLOY_PATH: /lombarye/full
WORK_DIR: /LOMAYA_BARYERY_BACKEND
HEALTHCHECK_URL: https://stage.lombaryery.tk/api/healthcheck
HEALTHCHECK_URL: https://тестовый.бот.ломаябарьеры.рф/api/healthcheck

defaults:
run:
Expand Down
4 changes: 2 additions & 2 deletions nginx/default.prod.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ server {
listen 443 ssl http2 default_server;
listen [::]:443 ssl http2 default_server;

# ssl_certificate /etc/letsencrypt/live/lombaryery.tk/fullchain.pem;
# ssl_certificate_key /etc/letsencrypt/live/lombaryery.tk/privkey.pem;
ssl_certificate /etc/letsencrypt/live/xn--90a0am.xn--80aacr0agnub4ii6a.xn--p1ai/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/xn--90a0am.xn--80aacr0agnub4ii6a.xn--p1ai/privkey.pem;

server_name ${APPLICATION_URL};

Expand Down
Loading