From 46e6261d41a0f2c32660dcbde77eaafad2806e4c Mon Sep 17 00:00:00 2001
From: yaso-meth <yasienmeth@gmail.com>
Date: Wed, 24 Jul 2024 14:08:49 +0200
Subject: [PATCH] .

---
 docker-compose.yml |   2 +-
 nginx/nginx.conf   | 112 ++++++++++++++++++++++++++-------------------
 2 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 80747aae..8072d7a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -110,7 +110,7 @@ services:
       - 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
+    command: certonly --webroot -w /var/www/certbot --force-renewal --email yasienmeth@gmail.com -d mzansi-innovation-hub.co.za -d app.mzansi-innovation-hub.co.za -d app.mzansi-innovation-hub.co.za --agree-tos
     networks:
       - MIH-network
     depends_on:
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index f570dff6..af16b1fa 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -22,66 +22,53 @@ http {
 
         server_name app.mzansi-innovation-hub.co.za;
 
-        return 301 https://app.mzansi-innovation-hub.co.za$request_uri;
-    }
-
-    server {
-        listen 443 ssl;
-        http2 on;
-        # use the certificates
-        ssl_certificate     /etc/letsencrypt/live/mzansi-innovation-hub.co.za/fullchain.pem;
-        ssl_certificate_key /etc/letsencrypt/live/mzansi-innovation-hub.co.za/privkey.pem;
-        server_name app.mzansi-innovation-hub.co.za;
-        root /var/www/html;
-        index index.php index.html index.htm;
-
-        # To allow special characters in headers
-        ignore_invalid_headers off;
-        # Allow any size file to be uploaded.
-        # Set to a value such as 1000m; to restrict file size to a specific value
-        client_max_body_size 0;
-        # To disable buffering
-        proxy_buffering off;
-        proxy_request_buffering off;
-
-        # Web App
+        Web App
         location / {
             proxy_pass http://MIH-UX:83/;
         }
 
         location ~ /.well-known/acme-challenge/ {
             root /var/www/certbot;
-        } 
+        }
+
+        # return 301 https://app.mzansi-innovation-hub.co.za$request_uri;
     }
 
+    # server {
+    #     listen 443 ssl;
+    #     http2 on;
+    #     # use the certificates
+    #     ssl_certificate     /etc/letsencrypt/live/mzansi-innovation-hub.co.za/fullchain.pem;
+    #     ssl_certificate_key /etc/letsencrypt/live/mzansi-innovation-hub.co.za/privkey.pem;
+    #     server_name app.mzansi-innovation-hub.co.za;
+    #     root /var/www/html;
+    #     index index.php index.html index.htm;
+
+    #     # To allow special characters in headers
+    #     ignore_invalid_headers off;
+    #     # Allow any size file to be uploaded.
+    #     # Set to a value such as 1000m; to restrict file size to a specific value
+    #     client_max_body_size 0;
+    #     # To disable buffering
+    #     proxy_buffering off;
+    #     proxy_request_buffering off;
+
+    #     # Web App
+    #     location / {
+    #         proxy_pass http://MIH-UX:83/;
+    #     }
+
+    #     location ~ /.well-known/acme-challenge/ {
+    #         root /var/www/certbot;
+    #     } 
+    # }
+
     server {
         listen 80;
 
         server_name api.mzansi-innovation-hub.co.za;
 
-        return 301 https://api.mzansi-innovation-hub.co.za$request_uri;
-    }
-
-    server {
-        listen 443 ssl;
-        http2 on;
-        # use the certificates
-        ssl_certificate     /etc/letsencrypt/live/mzansi-innovation-hub.co.za/fullchain.pem;
-        ssl_certificate_key /etc/letsencrypt/live/mzansi-innovation-hub.co.za/privkey.pem;
-        server_name api.mzansi-innovation-hub.co.za;
-        root /var/www/html;
-        index index.php index.html index.htm;
-
-        # To allow special characters in headers
-        ignore_invalid_headers off;
-        # Allow any size file to be uploaded.
-        # Set to a value such as 1000m; to restrict file size to a specific value
-        client_max_body_size 0;
-        # To disable buffering
-        proxy_buffering off;
-        proxy_request_buffering off;
-
-        # Web App
+        Web App
         location / {
             proxy_pass http://MIH-API-Hub:8080/;
         }
@@ -89,7 +76,38 @@ http {
         location ~ /.well-known/acme-challenge/ {
             root /var/www/certbot;
         } 
+
+        # return 301 https://api.mzansi-innovation-hub.co.za$request_uri;
     }
+
+    # server {
+    #     listen 443 ssl;
+    #     http2 on;
+    #     # use the certificates
+    #     ssl_certificate     /etc/letsencrypt/live/mzansi-innovation-hub.co.za/fullchain.pem;
+    #     ssl_certificate_key /etc/letsencrypt/live/mzansi-innovation-hub.co.za/privkey.pem;
+    #     server_name api.mzansi-innovation-hub.co.za;
+    #     root /var/www/html;
+    #     index index.php index.html index.htm;
+
+    #     # To allow special characters in headers
+    #     ignore_invalid_headers off;
+    #     # Allow any size file to be uploaded.
+    #     # Set to a value such as 1000m; to restrict file size to a specific value
+    #     client_max_body_size 0;
+    #     # To disable buffering
+    #     proxy_buffering off;
+    #     proxy_request_buffering off;
+
+    #     # Web App
+    #     location / {
+    #         proxy_pass http://MIH-API-Hub:8080/;
+    #     }
+
+    #     location ~ /.well-known/acme-challenge/ {
+    #         root /var/www/certbot;
+    #     } 
+    # }
 }
 
 # # API Hub