From 21a116fbeaf3112340b9ffdbd5f41f6ecc3e4cbb Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@2li.ch>
Date: Sat, 28 Nov 2020 01:22:25 +0100
Subject: [PATCH] add the API to the NGINX server

---
 docker-compose-development.yml |  2 +-
 frontend/Dockerfile            |  4 +--
 frontend/nginx.conf            | 45 ++++++++++++++++++++++------------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/docker-compose-development.yml b/docker-compose-development.yml
index 0cdf048..28ab520 100644
--- a/docker-compose-development.yml
+++ b/docker-compose-development.yml
@@ -30,4 +30,4 @@ services:
     ports:
       - 80:80
     volumes:
-      - ./static:/home/app/web/static
+      - ./static:/home/app/backend/static
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 0e3256e..59805aa 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -16,6 +16,6 @@ COPY --from=build-stage . /usr/share/nginx/html
 RUN rm /etc/nginx/conf.d/default.conf
 COPY nginx.conf /etc/nginx/conf.d
 
-ENV PORT = 8080
-EXPOSE 8080
+ENV PORT = 80
+EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/frontend/nginx.conf b/frontend/nginx.conf
index 660e7c0..1e2ccaf 100644
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -1,17 +1,30 @@
-server {
-
-  listen 8080;
-
-  location / {
-    root   /usr/share/nginx/html/app;
-    index  index.html index.htm;
-    try_files $uri $uri/ /index.html;
-  }
-
-  error_page   500 502 503 504  /50x.html;
-
-  location = /50x.html {
-    root   /usr/share/nginx/html;
-  }
-
+upstream network_inventory {
+    server backend:8000;
+}
+
+server {
+    listen 80;
+
+    location /api/ {
+        proxy_pass http://network_inventory;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
+
+    location /static/ {
+        alias /home/app/backend/static/;
+    }
+
+    location / {
+        root   /usr/share/nginx/html/app/dist;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+
+    error_page   500 502 503 504  /50x.html;
+
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
 }