From c9c1df42dae3a096e27905167698bcaa416f8d5b Mon Sep 17 00:00:00 2001
From: skeris <kotilion.95@gmail.com>
Date: Sat, 27 Jan 2024 01:11:44 +0300
Subject: [PATCH] =?UTF-8?q?feat:=20=D0=B7=D0=B0=D0=BB=D0=B8=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BB=D0=B5=D0=BD=D0=B4=D0=B8=D0=BD=D0=B3=D0=B0=20?=
 =?UTF-8?q?=D1=83=D1=81=D0=BB=D1=83=D0=B3=20=D0=BD=D0=B0=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B4\n=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B?=
 =?UTF-8?q?=D0=B5=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B0=D0=B9=D0=B7=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B3=D0=B8=20CORS=20=D0=B1=D0=B5=D0=B7=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=B0=D1=81=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 default.conf                         | 34 ++++++++++++++++++++++++----
 deployments/main/docker-compose.yaml |  4 ++--
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/default.conf b/default.conf
index 7079c9d..745a80d 100644
--- a/default.conf
+++ b/default.conf
@@ -2,7 +2,7 @@ server {
 	root /usr/share/nginx/html;
 
 	index index.html index.htm index.nginx-debian.html;
-  server_name _; # managed by Certbot
+  server_name quiz.pena.digital; # managed by Certbot
   client_max_body_size 70M;
 
   location /404 {
@@ -10,12 +10,36 @@ server {
   }
 
   location / {
-    if ($host = quiz.pena.digital) {
-        proxy_pass http://squiz;
-    }
+    proxy_pass http://squiz;
+	}
+
+  listen 443 ssl; # managed by Certbot
+  ssl_certificate /etc/nginx/certs/live/pena.digital/fullchain.pem; # managed by Certbot
+  ssl_certificate_key /etc/nginx/certs/live/pena.digital/privkey.pem; # managed by Certbot
+
+}
+server {
+	root /usr/share/nginx/html;
+
+	index index.html index.htm index.nginx-debian.html;
+  server_name pena.digital; # managed by Certbot
+  client_max_body_size 70M;
+
+  location /404 {
+     try_files $uri $uri/ /index.html;
+  }
+
+  location /feedback/ {
+    add_header Access-Control-Allow-Origin pena.digital always;
+    add_header Access-Control-Allow-Credentials true always;
+    add_header Access-Control-Allow-Headers content-type always;
+    proxy_set_header Host $host;
+    proxy_pass http://10.8.0.8:8006/;
+  }
+  location / {
+    proxy_pass http://services;
 	}
 
-  listen [::]:443 ssl ipv6only=on; # managed by Certbot
   listen 443 ssl; # managed by Certbot
   ssl_certificate /etc/nginx/certs/live/pena.digital/fullchain.pem; # managed by Certbot
   ssl_certificate_key /etc/nginx/certs/live/pena.digital/privkey.pem; # managed by Certbot
diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml
index 2c02f58..7bd224e 100644
--- a/deployments/main/docker-compose.yaml
+++ b/deployments/main/docker-compose.yaml
@@ -2,8 +2,8 @@ services:
   router:
     image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
     ports:
-      - 80:80
-      - 443:443
+      - 10.6.0.28:80:80
+      - 10.6.0.28:443:443
     restart: always
     volumes:
       - ./nginx/certs/:/etc/nginx/certs/:ro