From 910af39d6d3f38bcd11dba6bfa41786c1aa25e7e Mon Sep 17 00:00:00 2001
From: yaso-meth <yasienmeth@gmail.com>
Date: Wed, 17 Jul 2024 10:32:23 +0200
Subject: [PATCH] nginx to point to ui container

---
 docker-compose.yml | 24 ++++++++++--------------
 nginx/nginx.conf   |  6 ++----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 900ec248..4dd80505 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,7 +45,6 @@ services:
         - 443:443
     volumes:
         - ./nginx/nginx.conf:/etc/nginx/nginx.conf
-        - webApp:/usr/share/nginx/html
         - certbotConf:/etc/letsencrypt
         - certbotChall:/var/www/certbot
     depends_on:
@@ -57,21 +56,19 @@ services:
       context: ./Frontend/patient_manager
     ports:
       - "83:83"
-    volumes:
-      - webApp:/app/build/web
     depends_on:
       - api
   
-  certbot:
-    image: certbot/certbot
-    container_name: certbot
-    volumes: 
-      - certbotConf:/etc/letsencrypt
-      - certbotChall:/var/www/certbot
-    #command: certonly --test-cert --webroot -w /var/www/certbot --force-renewal --email yasienmeth@gmail.com -d mzansi-innovation-hub.co.za -d www.mzansi-innovation-hub.co.za --agree-tos
-    command: certonly --webroot -w /var/www/certbot --force-renewal --email yasienmeth@gmail.com -d mzansi-innovation-hub.co.za -d www.mzansi-innovation-hub.co.za --agree-tos
-    depends_on:
-      - nginx
+  # certbot:
+  #   image: certbot/certbot
+  #   container_name: certbot
+  #   volumes: 
+  #     - certbotConf:/etc/letsencrypt
+  #     - certbotChall:/var/www/certbot
+  #   #command: certonly --test-cert --webroot -w /var/www/certbot --force-renewal --email yasienmeth@gmail.com -d mzansi-innovation-hub.co.za -d www.mzansi-innovation-hub.co.za --agree-tos
+  #   command: certonly --webroot -w /var/www/certbot --force-renewal --email yasienmeth@gmail.com -d mzansi-innovation-hub.co.za -d www.mzansi-innovation-hub.co.za --agree-tos
+  #   depends_on:
+  #     - nginx
     
   minio:
     container_name: MIH-Minio
@@ -86,7 +83,6 @@ services:
       - MINIO_ROOT_PASSWORD=C@rtoon1995
       
 volumes:
-  webApp:
   certbotConf:
   certbotChall:
 #     driver: local
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 00f2d2b0..5aa868d0 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -45,12 +45,10 @@ http {
     server {
         listen 80 default_server;
 
-        server_name mzansi-innovation-hub.co.za;
+        server_name mzansi-innovation-hub.co.za www.mzansi-innovation-hub.co.za;
 
         location / {
-            root   /usr/share/nginx/html;
-            index  index.html;
-            try_files $uri $uri/ =404;
+            proxy_pass http://MIH-UX:83/;
         }
         location ~ /.well-known/acme-challenge/ {
             root /var/www/certbot;