merge
This commit is contained in:
+2
-2
@@ -17,9 +17,9 @@ DEFAULT_FROM_EMAIL = ''
|
||||
# telegram bot toekn
|
||||
TELEGRAM_BOT_TOKEN = ''
|
||||
# domain for allowed host and allowed cors
|
||||
DOMAIN = '38.60.202.91'
|
||||
DOMAIN = 'heymlz.com'
|
||||
# domain for api (the domain that django will use)
|
||||
API_DOMAIN = '38.60.202.91'
|
||||
API_DOMAIN = 'api.heymlz.com'
|
||||
SITE_TITLE = ''
|
||||
SITE_HEADER = ''
|
||||
# jwt token configs
|
||||
|
||||
@@ -35,10 +35,12 @@ DEBUG = False
|
||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||
if not DEBUG:
|
||||
ALLOWED_HOSTS = ['127.0.0.1', 'localhost', DOMAIN, API_DOMAIN]
|
||||
CSRF_TRUSTED_ORIGINS = [
|
||||
f"https://{DOMAIN}",
|
||||
f"http://{DOMAIN}",
|
||||
]
|
||||
# CSRF_TRUSTED_ORIGINS = [
|
||||
# f"https://{DOMAIN}",
|
||||
# f"http://{DOMAIN}",
|
||||
# f"https://{API_DOMAIN}",
|
||||
# f"http://{API_DOMAIN}",
|
||||
# ]
|
||||
# CORS_ALLOWED_ORIGINS = [f"https://{API_DOMAIN}", f"http://{API_DOMAIN}",
|
||||
# f"http://{DOMAIN}", f"https://{DOMAIN}", ]
|
||||
# import re
|
||||
|
||||
+10
-10
@@ -1,19 +1,19 @@
|
||||
services:
|
||||
frontend:
|
||||
build:
|
||||
context: ./frontend
|
||||
ports:
|
||||
- "80:3000"
|
||||
depends_on:
|
||||
- django
|
||||
networks:
|
||||
- default
|
||||
# frontend:
|
||||
# build:
|
||||
# context: ./frontend
|
||||
# ports:
|
||||
# - "80:3000"
|
||||
# depends_on:
|
||||
# - django
|
||||
# networks:
|
||||
# - default
|
||||
|
||||
django:
|
||||
build:
|
||||
context: ./backend
|
||||
ports:
|
||||
- "8001:8000"
|
||||
- "8000:8000"
|
||||
depends_on:
|
||||
- db
|
||||
volumes:
|
||||
|
||||
Reference in New Issue
Block a user