From 98e05a1094a2e680a5cc1455120c2c26271f9801 Mon Sep 17 00:00:00 2001
From: Aykhan <aykhan.shahs0@gmail.com>
Date: Wed, 20 Sep 2023 20:56:09 +0400
Subject: [PATCH] fix: get_remote_address & merged docker compose files

---
 config/nginx/{nginx.dev.conf => nginx.conf}  |  0
 config/nginx/nginx.prod.conf                 | 23 --------
 docker-compose-prod.yml                      | 56 --------------------
 docker-compose-dev.yml => docker-compose.yml |  2 +-
 src/app/utils/custom_functions.py            |  2 +-
 5 files changed, 2 insertions(+), 81 deletions(-)
 rename config/nginx/{nginx.dev.conf => nginx.conf} (100%)
 delete mode 100644 config/nginx/nginx.prod.conf
 delete mode 100644 docker-compose-prod.yml
 rename docker-compose-dev.yml => docker-compose.yml (93%)

diff --git a/config/nginx/nginx.dev.conf b/config/nginx/nginx.conf
similarity index 100%
rename from config/nginx/nginx.dev.conf
rename to config/nginx/nginx.conf
diff --git a/config/nginx/nginx.prod.conf b/config/nginx/nginx.prod.conf
deleted file mode 100644
index 6cf6e77..0000000
--- a/config/nginx/nginx.prod.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-upstream app_server{
-    server app:8000;
-}
-
-server{
-    listen 80;
-    server_name ui.aykhans.me;
-
-    location / {
-        proxy_pass http://app_server;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $http_CF_Connecting_IP;
-        proxy_redirect off;
-    }
-
-    location /static/ {
-        alias /static/;
-    }
-
-    location /media/ {
-        alias /media/;
-    }
-}
\ No newline at end of file
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
deleted file mode 100644
index a57d9a5..0000000
--- a/docker-compose-prod.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-version: "3.9"
-
-services:
-  db:
-    image: postgres
-    ports:
-      - 5432:5432
-    volumes:
-      - dbdata:/var/lib/postgresql/data
-    env_file:
-      - ./config/postgres/postgres.env
-
-  mongodb:
-    image: mongo:latest
-    env_file:
-      - ./config/mongodb/mongodb.env
-    ports:
-      - 27017:27017
-    volumes:
-      - mongodb_data:/data/db
-
-  app:
-    build: ./src/
-    env_file:
-      - ./config/postgres/postgres.env
-      - ./config/mongodb/mongodb.env
-      - ./config/app/app.env
-    ports:
-      - 8000:8000
-    depends_on:
-      - db
-      - mongodb
-    volumes:
-      - ./src/app:/src/app
-      - static:/src/static
-      - media:/src/media
-    command: >
-      bash -c "poetry run alembic upgrade head
-      && poetry run uvicorn --reload --host=0.0.0.0 --port=8000 app.main:app"
-
-  nginx:
-    image: nginx
-    ports:
-      - 80:80
-    volumes:
-      - ./config/nginx/nginx.prod.conf:/etc/nginx/conf.d/default.conf
-      - static:/static
-      - media:/media
-    depends_on:
-      - app
-
-volumes:
-  dbdata:
-  static:
-  media:
-  mongodb_data:
\ No newline at end of file
diff --git a/docker-compose-dev.yml b/docker-compose.yml
similarity index 93%
rename from docker-compose-dev.yml
rename to docker-compose.yml
index b07adb9..f358798 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
     ports:
       - 80:80
     volumes:
-      - ./config/nginx/nginx.dev.conf:/etc/nginx/conf.d/default.conf
+      - ./config/nginx/nginx.conf:/etc/nginx/conf.d/default.conf
       - static:/static
       - media:/media
     depends_on:
diff --git a/src/app/utils/custom_functions.py b/src/app/utils/custom_functions.py
index 40d2cce..2723244 100644
--- a/src/app/utils/custom_functions.py
+++ b/src/app/utils/custom_functions.py
@@ -8,4 +8,4 @@ def html2text(html: str) -> str:
 
 
 def get_remote_address(request: Request) -> str:
-    return request.headers.get('host')
+    return request.headers.get('x-forwarded-for').split(',')[0]