From 8e2b91402fc373585bd3e458a7bc2806a5879811 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 8 Aug 2023 16:14:58 +0300
Subject: [PATCH] Setup prod settings

---
 docker-compose-prod.yml                   | 10 +++-------
 nginx/default.conf                        |  4 ++--
 rsconcept/backend/project/settings.py     |  6 +++---
 rsconcept/frontend/Dockerfile             |  1 +
 rsconcept/frontend/src/utils/constants.ts |  1 -
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index b9d406f5..3a9a3955 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -1,10 +1,10 @@
 volumes:
   postgres_volume:
-    name: "portal-db"
+    name: "postgresql-db"
   django_static_volume:
-    name: "portal-static"
+    name: "static"
   django_media_volume:
-    name: "portal-media"
+    name: "media"
 
 networks:
   default:
@@ -19,7 +19,6 @@ secrets:
 services:
   frontend:
     restart: always
-    container_name: "portal-front"
     depends_on:
       - backend
     build: 
@@ -31,7 +30,6 @@ services:
 
   backend:
     restart: always
-    container_name: "portal-back"
     depends_on:
       - postgresql-db
       - nginx
@@ -55,7 +53,6 @@ services:
 
   postgresql-db:
     restart: always
-    container_name: "portal-db"
     image: postgres:alpine
     secrets:
       - db_password
@@ -68,7 +65,6 @@ services:
 
   nginx:
     restart: always
-    container_name: "portal-nginx"
     build:
       context: ./nginx
     ports:
diff --git a/nginx/default.conf b/nginx/default.conf
index 45d41406..56fd420b 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -1,12 +1,12 @@
 upstream innerdjango {
-    server backend:8000;
+    server back:8000;
     # `backend` is the service's name in docker-compose.yml,
     # The `innerdjango` is the name of upstream, used by nginx below. 
 }
 
 server {
     listen 80;
-    server_name portal.acconcept.ru;
+    server_name localhost dev.concept.ru www.dev.concept.ru portal.acconcept.ru www.portal.acconcept.ru;
     location / {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $host;
diff --git a/rsconcept/backend/project/settings.py b/rsconcept/backend/project/settings.py
index f943ebdc..d9c7b91e 100644
--- a/rsconcept/backend/project/settings.py
+++ b/rsconcept/backend/project/settings.py
@@ -82,9 +82,9 @@ MIDDLEWARE = [
 ]
 
 ROOT_URLCONF = 'project.urls'
-LOGIN_URL = '/accounts/login/'
-LOGIN_REDIRECT_URL = '/home'
-LOGOUT_REDIRECT_URL = '/home'
+LOGIN_URL = '/admin/login/'
+LOGIN_REDIRECT_URL = '/'
+LOGOUT_REDIRECT_URL = '/'
 
 TEMPLATES = [
     {
diff --git a/rsconcept/frontend/Dockerfile b/rsconcept/frontend/Dockerfile
index 667e758b..d7a259f6 100644
--- a/rsconcept/frontend/Dockerfile
+++ b/rsconcept/frontend/Dockerfile
@@ -11,6 +11,7 @@ WORKDIR /result
 
 COPY ./ ./
 RUN npm install
+ENV NODE_ENV production
 RUN npm run build
 
 # ========= Server =======
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index 36323b13..c924d45a 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -1,7 +1,6 @@
 // Constants
 const prod = {
   backend: 'http://dev.concept.ru:8000',
-  // backend: 'http://localhost:8000',
 };
 
 const dev = {