phzhik/kwork-poizonstore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: phzhik:cfb75bad34c3c7ce8dde1274f7a2604c1b1c1cce
Branches Tags
phzhik:dev
phzhik:master
..
compare: phzhik:e63addfaea84ea2b49e103f2ede4e0d0851ede91
Branches Tags
phzhik:dev
phzhik:master

No commits in common. "cfb75bad34c3c7ce8dde1274f7a2604c1b1c1cce" and "e63addfaea84ea2b49e103f2ede4e0d0851ede91" have entirely different histories.
cfb75bad34 ... e63addfaea

3 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

11
_deploy/nginx.conf
View File

@ -1,4 +1,4 @@
upstream django_stage { upstream django {
server 127.0.0.1:8002; server 127.0.0.1:8002;
} }
@ -9,15 +9,16 @@ server {
} }
server { server {
set $DOMAIN crm-poizonstore.ru;
set $APP_HOME /var/www/poizonstore-stage; set $APP_HOME /var/www/poizonstore-stage;
listen 443 ssl; listen 443 ssl;
server_name stage.crm-poizonstore.ru; server_name $DOMAIN;
charset utf-8; charset utf-8;
# === Add here SSL config === # === Add here SSL config ===
ssl_certificate /etc/letsencrypt/live/crm-poizonstore.ru/fullchain.pem; ssl_certificate /etc/letsencrypt/live/$DOMAIN/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/crm-poizonstore.ru/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/$DOMAIN/privkey.pem;
include /etc/letsencrypt/options-ssl-nginx.conf; include /etc/letsencrypt/options-ssl-nginx.conf;
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
@ -37,7 +38,7 @@ server {
} }
location / { location / {
uwsgi_pass django_stage; uwsgi_pass django;
uwsgi_read_timeout 300; uwsgi_read_timeout 300;
keepalive_timeout 70; keepalive_timeout 70;
proxy_read_timeout 1200s; proxy_read_timeout 1200s;

2
tg_bot/handlers/start.py
View File

@ -49,7 +49,7 @@ async def start_handler(message: types.Message, bot: AsyncTeleBot):
else: else:
# TODO: if user is signed in, send help text or account info instead # TODO: if user is signed in, send help text or account info instead
await bot.send_message(cid, TGCoreMessage.ALREADY_AUTH) pass
# TODO: implement sometime in the future # TODO: implement sometime in the future

1
tg_bot/messages.py
View File

@ -71,7 +71,6 @@ class TGOrderStatusMessage:
class TGCoreMessage: class TGCoreMessage:
START = "Добро пожаловать в PoizonStore!" START = "Добро пожаловать в PoizonStore!"
ALREADY_AUTH = "Вы уже авторизованы"
SHARE_PHONE_KEYBOARD = "Отправить номер телефона" SHARE_PHONE_KEYBOARD = "Отправить номер телефона"
SHARE_PHONE = "Поделитесь своим номером, чтобы авторизоваться:" SHARE_PHONE = "Поделитесь своим номером, чтобы авторизоваться:"