diff --git a/README.md b/README.md index 63776ec..d9cd56c 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Main deployed services: Traffic pattern: - `qlockify.ir` serves the frontend -- `api.qlockify.ir` serves the backend API, admin, docs, static, and media +- backend traffic is served from `qlockify.ir` under `/api` and `/admin` - Nginx terminates TLS and proxies requests to the frontend and backend containers ## Expected Repository Layout @@ -107,18 +107,17 @@ Configured domains: - `qlockify.ir` - `www.qlockify.ir` -- `api.qlockify.ir` Behavior: - `www.qlockify.ir` redirects to `qlockify.ir` - `http` redirects to `https` - frontend is served from `qlockify.ir` -- backend traffic is served from `api.qlockify.ir` +- backend traffic is proxied from `qlockify.ir/api` and `qlockify.ir/admin` Before production startup: -1. Point DNS records for `qlockify.ir`, `www.qlockify.ir`, and `api.qlockify.ir` to the server. +1. Point DNS records for `qlockify.ir` and `www.qlockify.ir` to the server. 2. Make sure `80` and `443` are open on the server firewall. 3. Make sure the TLS certificate covers all required names. @@ -147,10 +146,10 @@ Set these in: Core production values: -- `DJANGO_ALLOWED_HOSTS=api.qlockify.ir,qlockify.ir,www.qlockify.ir` +- `DJANGO_ALLOWED_HOSTS=qlockify.ir,www.qlockify.ir` - `CORS_ALLOWED_ORIGINS=https://qlockify.ir,https://www.qlockify.ir` -- `CSRF_TRUSTED_ORIGINS=https://api.qlockify.ir,https://qlockify.ir,https://www.qlockify.ir` -- `BASE_URL=https://api.qlockify.ir` +- `CSRF_TRUSTED_ORIGINS=https://qlockify.ir,https://www.qlockify.ir` +- `BASE_URL=https://qlockify.ir` - `POSTGRES_HOST=db` - `REDIS_HOST=redis` - `REDIS_URL=redis://redis:6379/0` @@ -161,7 +160,7 @@ Google OAuth values: - `GOOGLE_OAUTH_CLIENT_ID=...` - `GOOGLE_OAUTH_CLIENT_SECRET=...` -- `GOOGLE_OAUTH_REDIRECT_URI=https://api.qlockify.ir/api/users/oauth/google/callback/` +- `GOOGLE_OAUTH_REDIRECT_URI=https://qlockify.ir/api/users/oauth/google/callback/` - `GOOGLE_OAUTH_FRONTEND_CALLBACK_URL=https://qlockify.ir/auth/google/callback` ## Required Frontend Environment @@ -173,7 +172,7 @@ Set this in: ``` ```text -VITE_API_BASE_URL=https://api.qlockify.ir/api +VITE_API_BASE_URL=/api ``` ## Background Workers diff --git a/backend/.env.sample b/backend/.env.sample index f3a4fe4..88cf35a 100644 --- a/backend/.env.sample +++ b/backend/.env.sample @@ -44,7 +44,7 @@ LANGUAGE_CODE=en-us TIME_ZONE=Asia/Tehran SMS_APIKEY= -BASE_URL=https://api.qlockify.ir +BASE_URL=https://qlockify.ir GOOGLE_OAUTH_CLIENT_ID= GOOGLE_OAUTH_CLIENT_SECRET= GOOGLE_OAUTH_REDIRECT_URI=https://qlockify.ir/api/users/oauth/google/callback/