From bc16c3fad3ca3ff0691720545b70ab1fcce9eea4 Mon Sep 17 00:00:00 2001
From: Egor Matveev <emmtvv@icloud.com>
Date: Tue, 29 Mar 2022 14:59:27 +0300
Subject: [PATCH 1/6] nginx

---
 docker-compose-deploy.yaml | 18 ++++++++++++++++--
 nginx/nginx.conf           |  7 +++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 nginx/nginx.conf

diff --git a/docker-compose-deploy.yaml b/docker-compose-deploy.yaml
index 70a8007..0a77cbd 100644
--- a/docker-compose-deploy.yaml
+++ b/docker-compose-deploy.yaml
@@ -3,6 +3,22 @@ version: "3.4"
 
 services:
 
+  nginx:
+    image: nginx
+    volumes:
+      - nginx:/etc/nginx
+    networks:
+      - net
+    ports:
+      - "80:80"
+    deploy:
+      mode: replicated
+      restart_policy:
+        condition: any
+      update_config:
+        parallelism: 1
+        order: start-first
+
   postgres:
     image: postgres
     environment:
@@ -81,8 +97,6 @@ services:
     volumes:
       - /sprint-data/static:/usr/src/app/static
     command: ./manage.py runserver 0.0.0.0:80 --noreload --insecure
-    ports:
-      - "80:80"
     deploy:
       mode: replicated
       restart_policy:
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
new file mode 100644
index 0000000..b7d1df7
--- /dev/null
+++ b/nginx/nginx.conf
@@ -0,0 +1,7 @@
+server {
+    listen 80;
+
+    location / {
+        proxy_pass http://web:8000/;
+    }
+}
\ No newline at end of file

From 0cb0ee3aaed7351dc68a26a1de42e35f447421cc Mon Sep 17 00:00:00 2001
From: Egor Matveev <emmtvv@icloud.com>
Date: Tue, 29 Mar 2022 15:05:15 +0300
Subject: [PATCH 2/6] nginx

---
 docker-compose-deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-deploy.yaml b/docker-compose-deploy.yaml
index 0a77cbd..8fa44fb 100644
--- a/docker-compose-deploy.yaml
+++ b/docker-compose-deploy.yaml
@@ -6,7 +6,7 @@ services:
   nginx:
     image: nginx
     volumes:
-      - nginx:/etc/nginx
+      - ./nginx:/etc/nginx
     networks:
       - net
     ports:

From 82a956c0aedebc2c87c337e29a91aedce6986351 Mon Sep 17 00:00:00 2001
From: Egor Matveev <emmtvv@icloud.com>
Date: Tue, 29 Mar 2022 15:22:50 +0300
Subject: [PATCH 3/6] nginx

---
 nginx/nginx.conf | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index b7d1df7..5891cc5 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,7 +1,10 @@
-server {
-    listen 80;
+http {
+    server {
+        listen      80;
+        server_name a.com;
 
-    location / {
-        proxy_pass http://web:8000/;
+        location / {
+            proxy_pass http://web:8000/;
+        }
     }
 }
\ No newline at end of file

From 05349a79c8f94371083c083229ea615e4f6f9a31 Mon Sep 17 00:00:00 2001
From: Egor Matveev <emmtvv@icloud.com>
Date: Tue, 29 Mar 2022 15:28:16 +0300
Subject: [PATCH 4/6] nginx

---
 nginx/nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 5891cc5..4a919c8 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,4 +1,5 @@
 http {
+    events {}
     server {
         listen      80;
         server_name a.com;

From 59a2d2cdefb8f725e0ad6997fa58cda05d33f9e5 Mon Sep 17 00:00:00 2001
From: Egor Matveev <emmtvv@icloud.com>
Date: Tue, 29 Mar 2022 15:33:36 +0300
Subject: [PATCH 5/6] nginx

---
 nginx/nginx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 4a919c8..1321bf0 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,5 +1,6 @@
+events {}
+
 http {
-    events {}
     server {
         listen      80;
         server_name a.com;

From 6155f9e258b8c4c4c6dd89eb32b7ba052fc96f51 Mon Sep 17 00:00:00 2001
From: Egor Matveev <emmtvv@icloud.com>
Date: Tue, 29 Mar 2022 15:39:58 +0300
Subject: [PATCH 6/6] nginx

---
 docker-compose-deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-deploy.yaml b/docker-compose-deploy.yaml
index 8fa44fb..8fa1079 100644
--- a/docker-compose-deploy.yaml
+++ b/docker-compose-deploy.yaml
@@ -96,7 +96,7 @@ services:
       TELEGRAM_TOKEN: $TELEGRAM_TOKEN
     volumes:
       - /sprint-data/static:/usr/src/app/static
-    command: ./manage.py runserver 0.0.0.0:80 --noreload --insecure
+    command: ./manage.py runserver 0.0.0.0:8000 --noreload --insecure
     deploy:
       mode: replicated
       restart_policy: