From 7c7bf5141522495eb32440f48547cf3201927d54 Mon Sep 17 00:00:00 2001
From: James Ketrenos <james_git@ketrenos.com>
Date: Sun, 15 Jan 2023 17:22:01 -0800
Subject: [PATCH] Added nginx configurations

Signed-off-by: James Ketrenos <james_git@ketrenos.com>
---
 Dockerfile                  | 2 ++
 docker-compose.yml          | 1 +
 server/development.location | 2 +-
 server/nginx.conf           | 2 +-
 server/production.location  | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 26595e0..b31aab3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,6 +62,7 @@ COPY /ketrface /website/ketrface
 SHELL [ "/bin/bash", "-c" ]
 
 ARG DEVELOPMENT=
+RUN cp /website/server/nginx.conf /etc/nginx/sites-enabled/default
 
 # If not DEVELOPMENT mode, copy production config, else development
 RUN \
@@ -83,6 +84,7 @@ RUN \
   fi
 
 COPY /scripts /opt/scripts
+ENV PATH="${PATH}:/opt/scripts"
 
 # In DEVELOPMENT mode, entrypoint launches 'npm start'
 COPY /entrypoint.sh /
diff --git a/docker-compose.yml b/docker-compose.yml
index e537a26..812e5ee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,7 @@ services:
       - ${PORT}:80             # nginx -> server/app.js express app
       - 127.0.0.1:14200:4200   # shellinabox
     volumes:
+      - /etc/nginx/ssl:/etc/nginx/ssl:ro # Use host web keys
       - ${PICTURES}:/pictures
       - ${PWD}/db:/website/db
       - ${PWD}/config/local.json:/website/config/local.json
diff --git a/server/development.location b/server/development.location
index bef2e9b..95acfbc 100644
--- a/server/development.location
+++ b/server/development.location
@@ -1,5 +1,5 @@
 # DEVELOPMENT -- use npm development server on port 3000 (entrypoint.sh)
-location / {
+location /identities {
   proxy_set_header X-Real-IP $remote_addr;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   proxy_set_header X-Forwarded-Proto $scheme;
diff --git a/server/nginx.conf b/server/nginx.conf
index 65f2e19..40aefd5 100644
--- a/server/nginx.conf
+++ b/server/nginx.conf
@@ -44,7 +44,7 @@ server {
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
-    proxy_pass https://localhost:8123/;
+    proxy_pass http://localhost:8123/;      # server/app.js - no HTTPS
   }
 
   location ~ /(db|conf) {
diff --git a/server/production.location b/server/production.location
index 3a654ce..aa35c62 100644
--- a/server/production.location
+++ b/server/production.location
@@ -1,5 +1,5 @@
 # PRODUCTION -- pre-built source
-location / {
+location /identities {
   try_files $uri $uri/ =404;
   alias /website/client/build/;
   index index.html;